diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-01-15 13:58:07 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-01-15 13:58:07 +0100 |
| commit | 424477dfbc84f12af8223b004692d84b0d3ea5aa (patch) | |
| tree | adc7a5b312b6a95629531d83bcd09391c6d0832f /src/main/java/de/thedevstack/conversationsplus/xmpp/pubsub | |
| parent | 63a40ed65fb16ead440de52fb8bd26c523b75b82 (diff) | |
| parent | 1f40166b3105ab78ce02339b16c9cb9eea921ec7 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/xmpp/pubsub')
0 files changed, 0 insertions, 0 deletions