diff options
| author | lookshe <github@lookshe.org> | 2015-10-05 13:55:43 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2015-10-05 13:55:43 +0200 |
| commit | b98478e57c088efc63fd470e429f791dd664707a (patch) | |
| tree | e722ed48ee2ec125d8ad9250f79d8e1ca95666a7 /src/main/AndroidManifest.xml | |
| parent | 5850cbcf9c3e72580f3288c582737a04e8148b79 (diff) | |
| parent | 6f17b06ad008cc7ac89174ba7ac7cc96ee0881eb (diff) | |
Merge branch 'trz/rename' into trz/rebase
Conflicts:
build.gradle
src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
Diffstat (limited to 'src/main/AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions