aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/utils
diff options
context:
space:
mode:
authorDaniel Gultsch <inputmice@siacs.eu>2014-12-30 09:36:17 +0100
committerDaniel Gultsch <inputmice@siacs.eu>2014-12-30 09:36:17 +0100
commitb71740f0d40ed3fb3e5b790d80ed6cb235f97d04 (patch)
tree99367303fb7b92cb1f34d8c236ad53c31c1d4bb4 /src/main/java/eu/siacs/conversations/utils
parent8f93f9c314d1bf731eac64007f3c9459fa92de1f (diff)
parentcacddef75668c1811d951795c2276c20255c9142 (diff)
Merge remote-tracking branch 'origin/development' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/utils')
0 files changed, 0 insertions, 0 deletions