diff options
author | lookshe <github@lookshe.org> | 2016-03-20 02:14:45 +0100 |
---|---|---|
committer | lookshe <github@lookshe.org> | 2016-03-20 02:14:45 +0100 |
commit | c9b7ed3d3f6cde5e78bf0fa7a77eae81f13cbc09 (patch) | |
tree | 84fcd6dca2e2b1904eca61fad16a85e465b87fae /src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas | |
parent | 98e61f189c5f8bce7a001997fa2352c0c27f2778 (diff) | |
parent | d89d7a300058e87a4dbf1b1f5b3fe9275ebcb2ae (diff) |
Merge branch 'trz/rebase' into trz/merge_1.11.1trz/merge_1.11.1
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas')
0 files changed, 0 insertions, 0 deletions