aboutsummaryrefslogtreecommitdiffstats
path: root/art
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-11-16 12:27:17 +0100
committeriNPUTmice <daniel@gultsch.de>2014-11-16 12:27:17 +0100
commitd43aeb721835e43a15e3496b3c06dda54d516d76 (patch)
tree686c80b7315d25e3d72b92b1c5daf858fc114185 /art
parentac8c2b7e62343fdaaff3b018cb187962a655acf5 (diff)
parent279534ddb485007721d43751408fae42cd98b955 (diff)
Merge branch 'master' into development
Conflicts: src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
Diffstat (limited to 'art')
0 files changed, 0 insertions, 0 deletions