diff options
author | steckbrief <steckbrief@chefmail.de> | 2016-03-08 23:21:44 +0100 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2016-03-08 23:22:36 +0100 |
commit | 9af0794911b7993b612d23b3851fc5f5754bb2a0 (patch) | |
tree | 68e8b00f6031e4c19ca4dbcbdbbb2101acabd499 /src/main/java/de/thedevstack/conversationsplus/xmpp | |
parent | a5243a8160bd9d939299a44db8e28331ac756911 (diff) | |
parent | 85bb3f537ae253d367c4be19305d4ad3c2bb8f76 (diff) |
Merge remote branch 'master'
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/xmpp')
0 files changed, 0 insertions, 0 deletions