diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-03-30 22:12:49 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-03-30 22:12:49 +0200 |
| commit | 75c5275f7e9a27019b9517770603ca4c77f1fbd9 (patch) | |
| tree | 567d10bd9e559089487f5627c436000e2a1a8fc8 /libs/otr4j-0.21.jar | |
| parent | c8fe93cf0a99481bfe7a30bbc1cd98383205bcaa (diff) | |
| parent | 7eabdfd80f50634282307f45c5f99ab46181805d (diff) | |
Merge tag '1.2.0' into trz/master
Conflicts:
src/main/java/eu/siacs/conversations/parser/AbstractParser.java
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
src/main/res/values-de/strings.xml
src/main/res/xml/preferences.xml
Diffstat (limited to 'libs/otr4j-0.21.jar')
0 files changed, 0 insertions, 0 deletions