diff options
| author | Gustav Eek <gustav@fripost.org> | 2015-03-02 20:28:05 +0100 |
|---|---|---|
| committer | Gustav Eek <gustav@fripost.org> | 2015-03-02 20:28:05 +0100 |
| commit | 8c9f57713b34a6a1e9e8a2c67aa17c43e644ad2e (patch) | |
| tree | 44a638f050c69b61b5c5d536664a72e4bc5e64a6 /lib/sync | |
| parent | fe12842374a257c03c7210ae9fddfdafe5cb79d7 (diff) | |
| parent | 4b3b4a69975aa2c8fb50173b76b0c7797e4ca5fb (diff) | |
Merge branch 'may-19', containing minutes from May 19 and June 16
Conflict for '2014/Makefile' was solved
Diffstat (limited to 'lib/sync')
0 files changed, 0 insertions, 0 deletions