aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations
diff options
context:
space:
mode:
authorDaniel Gultsch <inputmice@siacs.eu>2015-01-04 17:23:51 +0100
committerDaniel Gultsch <inputmice@siacs.eu>2015-01-04 17:23:51 +0100
commitd7ac9b88cf608e9a1dd66af8149264f89ba9678d (patch)
tree054c0b5439f75161d18ae883d6f2ca9c046d5aa1 /src/main/java/eu/siacs/conversations
parent0c804af1bc22c5aaf95c3bbf53964d43a431b46f (diff)
parent4f34a8f73fa35d223cdad0df3ac93839ffbf2371 (diff)
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations')
0 files changed, 0 insertions, 0 deletions