aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-08-23 13:36:08 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-08-23 13:36:08 +0200
commitbea7b2bcc1082fec73778ad29b2095f79219302a (patch)
tree3b40a76ef594cb7ad7dd80a34b670ca4c5a90e8a /src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
parent06fffc13cd1abf5576ef5ffb70798a42614a79a8 (diff)
parent10a9bd3864be5903d6cb4386f815bbc406d90d4f (diff)
Merge pull request #1348 from betheg/zxing
update zxing to v3.2.1
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services/XmppConnectionService.java')
0 files changed, 0 insertions, 0 deletions