| commit | 1616042be691fab99ab1a1d6eaf920812153e4ec | [log] [tgz] |
|---|---|---|
| author | Matthieu Baechler <matthieu.baechler@linagora.com> | Mon Jul 25 17:42:05 2016 +0200 |
| committer | Matthieu Baechler <matthieu.baechler@linagora.com> | Mon Jul 25 17:42:05 2016 +0200 |
| tree | d139fe5792da85661695b7d3b48b7d04bda9880b | |
| parent | f888958349de0a37b0fea435d15963d34be22adc [diff] | |
| parent | a897f587f539eb02f3e4925e220d7a5db21c4e09 [diff] |
Merge remote-tracking branch 'laura/JAMES-1805'