diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-04-23 23:22:57 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-04-23 23:22:57 +0200 |
| commit | b5abdd1b6ddf73cc9da49e3213d0d44e4b29ff5c (patch) | |
| tree | b1d28cc2b00622d7feeff4569aa2a054d3a82b80 /ManualBuildForFdroid.md | |
| parent | 52fec558adb2b4d9bb3df314fd919570e7198e26 (diff) | |
| parent | b789ace386ef3cfe6e0c3834b2a425813f702f43 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Conflicts:
src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java
src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java
src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions