diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-03-29 22:35:28 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-03-29 22:35:28 +0200 |
| commit | a0c4b022de514ef0334b8aa28662338519eb2071 (patch) | |
| tree | beceb80779946decd8458910b6864c83a67e93d2 /art | |
| parent | e388dfc0b8c32ea5916ae6f803217061dac58663 (diff) | |
| parent | bcf0d929dda50a3c8c94e5d384840bedc51d4e63 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Conflicts:
src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
Diffstat (limited to 'art')
0 files changed, 0 insertions, 0 deletions