diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-03-29 11:53:34 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-03-29 11:53:34 +0200 |
| commit | e388dfc0b8c32ea5916ae6f803217061dac58663 (patch) | |
| tree | 64162bd7e68fbe0ae83b354ff7d6878948c2bee1 /src/main/java/de/thedevstack/conversationsplus/xmpp | |
| parent | 77b1f2138e19545a48ea93c97f8518a87b065831 (diff) | |
| parent | 6244834096727cfc1aaaeba7845a6d9cfe27d2b0 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Conflicts:
src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
src/main/java/eu/siacs/conversations/ui/forms/FormFieldWrapper.java
src/main/java/eu/siacs/conversations/utils/UIHelper.java
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/xmpp')
0 files changed, 0 insertions, 0 deletions