aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/parser/PresenceParser.java
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-06-06 16:44:40 +0200
committeriNPUTmice <daniel@gultsch.de>2014-06-06 16:44:40 +0200
commit5cd750cb5e7ce5e9b0ddcab8e0089b964d1de70d (patch)
treeebbec8a6d42bb769f2b5e717a47a05aa7fbfaf6d /src/eu/siacs/conversations/parser/PresenceParser.java
parenta1507d91ffc8e0edcdb4fae7a95d746c0091622e (diff)
parentc489f368b861bdee5e438301e1cc6b6e8c067e54 (diff)
Merge branch 'kruks23-development' into development
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions