diff options
| author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-01-20 18:40:04 +0000 |
|---|---|---|
| committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-01-20 18:40:04 +0000 |
| commit | 23201220bf8b7b63da44747be142face0c98eb09 (patch) | |
| tree | c1645f62976281a552963b1309307e0d0b6136f3 /bb494884dff041662ee188f19d4969ea2d38e7d0 | |
| parent | 7e03247a9e219fe8e57d544957eb06e305e69fc1 (diff) | |
| parent | eaa092eb1a8f3ae19551e6e80f84d174211b5208 (diff) | |
Merge branch 'merge_immerda' into 'master'
This is my attempt at merging the huge backlog of commits from immerda. I've been pretty verbose about it in redmine so I won't repeat it all here. For details, see:
https://labs.riseup.net/code/issues/4132
Diffstat (limited to 'bb494884dff041662ee188f19d4969ea2d38e7d0')
0 files changed, 0 insertions, 0 deletions