diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-04-06 22:51:21 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-04-06 22:51:21 +0200 |
| commit | 4ace80d39ade18934d310ba37559c9c7ec8004dd (patch) | |
| tree | d65d00e0ea19af3af2e569be15121a014bec39a1 /src/main/java/de/thedevstack/conversationsplus/xmpp/OnAdvancedStreamFeaturesLoaded.java | |
| parent | b55ce9ee90533eb7762ad11ea7b22193cbd94ed5 (diff) | |
| parent | 18548e9ebb246071f0bc46ca3bb07a300176cf24 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Conflicts:
src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/xmpp/OnAdvancedStreamFeaturesLoaded.java')
0 files changed, 0 insertions, 0 deletions