aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/xmpp
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-03-12 21:22:44 +0100
committersteckbrief <steckbrief@chefmail.de>2016-03-12 21:22:44 +0100
commit340272ba841be12dcdf1317e183a45d8b46dce44 (patch)
tree4c4cf2121ccfdb1da3ab2825f6ee2de9132531be /src/main/java/de/thedevstack/conversationsplus/xmpp
parent86afdc7aaff4ed6fa37e6d5fd9e5ffab20375f21 (diff)
parenta95d2d9134508ec694cb48db361f1fd4387d1827 (diff)
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/xmpp')
0 files changed, 0 insertions, 0 deletions