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 /agenda | |
| parent | 6fab3cb421b68d419193490a6bcc122290866013 (diff) | |
| parent | 22eec5d6ac3b064d43f7ffba05eb0b5819532a4f (diff) | |
Merge branch 'annual-mar-29', minutes from annual meeting 2014
Conflicting '2014/Makefile' was resolved
Diffstat (limited to 'agenda')
0 files changed, 0 insertions, 0 deletions