aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-12-13 13:55:24 +0100
committeriNPUTmice <daniel@gultsch.de>2014-12-13 13:55:24 +0100
commit02a89f4ce2228c2e0f528f89fa1fe850c6f50fe8 (patch)
tree31f87dfe762eb5f3ac28f29e28d860f5809edd0f /CHANGELOG.md
parent2368ba518dbe16a2718de0b65470d9a7348f0bea (diff)
parentb523518e4b5a98d5a30aed2ec246fc83c42f5f6c (diff)
Merge branch 'feature/mam' into development
Conflicts: src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
Diffstat (limited to 'CHANGELOG.md')
0 files changed, 0 insertions, 0 deletions