diff options
| author | steckbrief <steckbrief@chefmail.de> | 2017-01-05 20:24:22 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2017-01-05 20:24:22 +0100 |
| commit | 867ee316619f814e6311668d0f2b910cecdd6393 (patch) | |
| tree | ce39aaa692943e602ecc95033d0504679fabb633 /src/main/java/de/thedevstack/conversationsplus/xmpp/pubsub | |
| parent | 93c3c723a9f7411087125b802badd788484ee6fb (diff) | |
| parent | 59e861ee6904296cbe8dd43c4a29513c2e928981 (diff) | |
Merge branch 'trz/rebase' (early part) into trz/rename
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/xmpp/pubsub')
0 files changed, 0 insertions, 0 deletions