diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-01-15 12:58:58 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-01-15 12:58:58 +0100 |
| commit | 63a40ed65fb16ead440de52fb8bd26c523b75b82 (patch) | |
| tree | e89b2ffd2ba9536cb2e946a4b5be223516a10444 /src/main/java/de/thedevstack/conversationsplus/xmpp | |
| parent | 732de65479850776b995b1f1f913505b3c0d4cd9 (diff) | |
| parent | 34cd66e8e08e965eace131fd2e5ef485f61a59fe (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