aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services
diff options
context:
space:
mode:
authorDaniel Gultsch <inputmice@siacs.eu>2015-01-07 18:32:51 +0100
committerDaniel Gultsch <inputmice@siacs.eu>2015-01-07 18:32:51 +0100
commitd70b5f93f3b779bf135b2bfe615093a810841dca (patch)
treead4f01d23f82c04b5398ef450107f2ef313b43d6 /src/main/java/eu/siacs/conversations/services
parent0ad8796b4402cf9f39c6aede7873429cfcd0d4ad (diff)
parent8ab19faddd10ca0c3aef0f47b618222ae24e79f6 (diff)
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions