diff options
| author | lookshe <github@lookshe.org> | 2016-02-16 11:41:54 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-02-16 11:41:54 +0100 |
| commit | 1e40764b20a08170f8e4bfe1f1ae1559111f2961 (patch) | |
| tree | 1791a3870361f37c3c34c299d075f56ed4a6e2c2 /art/omemo_logo.svg | |
| parent | a049aff638f27b68f08c753d42ef0fc2847b96cb (diff) | |
| parent | d58d822215708cc0d9c841872abab448bf290e4c (diff) | |
Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4
Conflicts:
build.gradle
src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java
src/main/java/eu/siacs/conversations/parser/PresenceParser.java
src/main/java/eu/siacs/conversations/services/MessageArchiveService.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/ui/adapter/MessageAdapter.java
src/main/res/values/arrays.xml
Diffstat (limited to 'art/omemo_logo.svg')
0 files changed, 0 insertions, 0 deletions