diff options
| author | Gustav Eek <gustav@fripost.org> | 2015-03-02 20:17:45 +0100 |
|---|---|---|
| committer | Gustav Eek <gustav@fripost.org> | 2015-03-02 20:17:45 +0100 |
| commit | fe12842374a257c03c7210ae9fddfdafe5cb79d7 (patch) | |
| tree | 5c9062e62c8cec3b4052fc5544d8d3af975fbe74 /resources/participants | |
| parent | 6fab3cb421b68d419193490a6bcc122290866013 (diff) | |
| parent | 22eec5d6ac3b064d43f7ffba05eb0b5819532a4f (diff) | |
Merge branch 'annual-mar-29', minutes from annual meeting 2014
Conflicting '2014/Makefile' was resolved
Diffstat (limited to 'resources/participants')
| -rw-r--r-- | resources/participants | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/resources/participants b/resources/participants new file mode 100644 index 0000000..468c9eb --- /dev/null +++ b/resources/participants @@ -0,0 +1,28 @@ +Navid Abdi +Fredrik Ahlsgren +Daniel Andersson +Mikael Andersson +Marco Baxmyr +Andréa Bruzelius +Rikard Bruzelius +Grégoire Détrez +Gustav Eek +Daniel Eriksson +Dagfinn L. Hotvedt +Mattias Ivarsson +Stefan Kangas +Jens Lideström +Guilhem Moulin +Lola Möller +Leif-Jöran Olsson +Taraka Rama +Dan Ros\'en +Stian Rødven Eide +Albin S. +Andreas Skyman +Delphine Szymczak +Johan Söderberg +Ver Takeo +Eva Werner +Anders +Anders (alias\ Hypermakt) |