diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-08-23 13:57:14 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-08-23 13:57:14 +0200 |
| commit | b0710cdf040bae21828d913ef71af59165609f5b (patch) | |
| tree | e00cecdc3dd152e437f942cdf71f1b754d6f93d8 /src/main/java/eu/siacs/conversations/services/MessageArchiveService.java | |
| parent | bea7b2bcc1082fec73778ad29b2095f79219302a (diff) | |
| parent | 560e63564dfb4608de6615b1388e6651d5ee93ba (diff) | |
Merge branch 'master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services/MessageArchiveService.java')
0 files changed, 0 insertions, 0 deletions