Merge branch 'develop' into feature/new_contact_list_design

cc9f3cfe · Grigory Fedorov · 9f4b1a7c · 0140402c · fb78c5bc
Commit cc9f3cfe authored Apr 09, 2015 by Grigory Fedorov
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

otr4j app/otr4j +1 -1

No files found.
--- a/otr4j @ fb78c5bc
+++ b/otr4j @ fb78c5bc
-Subproject commit 284a850bbed4b678375f84dfde06118986954678
+Subproject commit fb78c5bce8c9cbbb7d09d9eb76a847a03b18b100