diff options
| author | lookshe <github@lookshe.org> | 2016-04-17 16:54:19 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-04-17 16:54:19 +0200 |
| commit | 4b11fa4c69834d8e03b18032e12b0ce788da2f70 (patch) | |
| tree | 05dac279672a3a207699dc78d44e6cede0f07fb5 /src/main/res/drawable-mdpi/ic_edit_white_24dp.png | |
| parent | 2fdd4e6518e16949ce483b15471714b10e9cb92e (diff) | |
| parent | bfe01c432244e04daf6804d5cfc3b838ea247c4b (diff) | |
Merge tag '1.11.7' into trz/merge_1.11.7
Conflicts:
README.md
build.gradle
gradle/wrapper/gradle-wrapper.properties
src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
src/main/java/eu/siacs/conversations/persistance/FileBackend.java
src/main/java/eu/siacs/conversations/services/AvatarService.java
src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.java
src/main/java/eu/siacs/conversations/services/NotificationService.java
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
src/main/java/eu/siacs/conversations/ui/ConversationActivity.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/ShareWithActivity.java
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
src/main/res/values-cs/strings.xml
src/main/res/values-de/strings.xml
src/main/res/values-es/strings.xml
src/main/res/values-fr/strings.xml
src/main/res/values-it/strings.xml
src/main/res/values-pt-rBR/strings.xml
src/main/res/values-zh-rCN/strings.xml
src/main/res/values/strings.xml
src/main/res/xml/preferences.xml
Diffstat (limited to 'src/main/res/drawable-mdpi/ic_edit_white_24dp.png')
0 files changed, 0 insertions, 0 deletions