commit | db5a3b8d9cc35ee512b0e090e985bcc4e73c7a26 | [log] [tgz] |
---|---|---|
author | Matthieu Baechler <matthieu.baechler@linagora.com> | Wed Jul 27 11:01:29 2016 +0200 |
committer | Matthieu Baechler <matthieu.baechler@linagora.com> | Wed Jul 27 11:01:29 2016 +0200 |
tree | 85a1ee8d6c4f8483c6139567e5608e0b16d78b70 | |
parent | fbc09db2f877d32b2f6d57e96ae06c96668f0842 [diff] | |
parent | 612ca203fec6660d0756217a416e61c461fd2b92 [diff] |
Merge remote-tracking branch 'laura/JAMES-1809'