diff options
| author | Gustav Eek <gustav.eek@etraveli.com> | 2017-05-09 21:53:15 +0200 |
|---|---|---|
| committer | Gustav Eek <gustav.eek@etraveli.com> | 2017-05-09 21:53:15 +0200 |
| commit | b5b613ed628948d38968e897b6d4558d227c613e (patch) | |
| tree | a7366bdc47261522b584c684b23ba44e7ae5d844 /resources | |
| parent | ad33c470cc6f8878afd24133f4ffd1db7acff5ca (diff) | |
| parent | bbdb2e6b58317aac124c0bf176bd2e67b4ed4413 (diff) | |
Merge branch '2016-04-17-annual' into 2017-05-13-annual
Conflicts:
2016/Makefile
agenda/Makefile
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/participants | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/resources/participants b/resources/participants index 8b124f1..3267ba2 100644 --- a/resources/participants +++ b/resources/participants @@ -27,3 +27,5 @@ Ver Takeo Eva Werner Anders Anders (alias\ Hypermakt) +Lana +Swantje |