| commit | 0dd61725970bf197d5aa1ed0b2f7a8c1199fd2ef | [log] [tgz] |
|---|---|---|
| author | Matthieu Baechler <matthieu.baechler@linagora.com> | Tue Jul 26 14:49:12 2016 +0200 |
| committer | Matthieu Baechler <matthieu.baechler@linagora.com> | Tue Jul 26 14:49:12 2016 +0200 |
| tree | 82d1e7462342203ac18db0df36395b87575beaf7 | |
| parent | 02fd0ae4d7f5616145bffccb7946bf40cad52a63 [diff] | |
| parent | b57b4447484e16f45ce995de72bea1eaa6bf376b [diff] |
Merge remote-tracking branch 'antoine/JAMES-1810'