diff options
| author | lookshe <github@lookshe.org> | 2016-02-22 14:36:35 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-02-22 14:36:35 +0100 |
| commit | c5e60b43b8e107702445e834bce8a3c77f676eb8 (patch) | |
| tree | 266138fdf20f29f7ed8a31d4682f02cd7012cf0e /src/main/res/drawable-xxhdpi/smiley.png | |
| parent | 1e40764b20a08170f8e4bfe1f1ae1559111f2961 (diff) | |
| parent | c20d8ac69eeade4d5337d958ada7910db0c6d3a0 (diff) | |
Merge tag '1.10.0' into trz/merge_1.10.0
Conflicts:
README.md
build.gradle
src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
src/main/java/eu/siacs/conversations/parser/MessageParser.java
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
src/main/res/layout/activity_edit_account.xml
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-eu/strings.xml
src/main/res/values-gl/strings.xml
src/main/res/values-it/strings.xml
src/main/res/values-ja/strings.xml
src/main/res/values-nb-rNO/strings.xml
src/main/res/values-nl/strings.xml
src/main/res/values-pl/strings.xml
src/main/res/values-sr/strings.xml
src/main/res/values-zh-rCN/strings.xml
src/main/res/values-zh-rTW/strings.xml
src/main/res/values/strings.xml
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions