aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-12-15 17:16:49 +0100
committeriNPUTmice <daniel@gultsch.de>2014-12-15 17:16:49 +0100
commit25d8546ae89da97e975e72e9eb2f0608fb38aad5 (patch)
tree2dffd319c33c95a4ee33bb884f1a1a5407c0173e /src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java
parent2bd4621245dfcf1a64f68e1c3d1ae82e44cbe4b9 (diff)
parenta6d4b0aec5ab5d8df887e7e0aefaaeef7c42a8b9 (diff)
Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations into SamWhited-quiet-hours
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions