lookshe 4b11fa4c69 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		2016-04-17 16:54:19 +02:00
..
3rdParty	Merge tag '1.11.3' into trz/rebase	2016-04-05 23:24:49 +02:00
colorpicker	Build cleanup: libraries added as local resources, removed unused proguard configs, removed SwipyRefreshLayout as module and added as binary dependency, moved 3rd party binaries to separate folder	2015-12-14 14:56:46 +01:00
emojicon	Fixes FS#174: Displaying of ASCII emoticons differs	2016-03-30 01:02:00 +02:00
MemorizingTrustManager	update gradle and gradle plugin	2016-04-09 21:47:10 +02:00
thedevstacklogcat	Merge tag '1.11.7' into trz/merge_1.11.7	2016-04-17 16:54:19 +02:00