diff options
| author | lookshe <github@lookshe.org> | 2016-03-12 15:51:17 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-12 15:51:17 +0100 |
| commit | 14c2c72bc1a00c8b9839047cdc73116e561ecd62 (patch) | |
| tree | fe0828e9357d1876a0e3aa72ae13a2dad19718c4 /src/main/java/de/thedevstack/conversationsplus/xmpp/pep | |
| parent | 2a486c667a0c81772fcf125c5c3c9b49c78250e3 (diff) | |
| parent | dc26c95b40c3d0f48ed539f91e53c1bff1dceec6 (diff) | |
Merge branch 'trz/rebase' into trz/rename
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/xmpp/pep')
0 files changed, 0 insertions, 0 deletions