aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-01-21 11:48:42 +0100
committerDaniel Gultsch <daniel@gultsch.de>2015-01-21 11:48:42 +0100
commit818c0e609cb822cb67af1b0ec9166ef4d6eca29c (patch)
tree1feb856a90a6e4820ffeae985887a47440c421c7 /src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
parent7df6ae9ef88428c367f882433cf77b589e8e4c1e (diff)
parentfa7d748c3f8ec08ec161e6fac48c88279c655b39 (diff)
Merge pull request #908 from betheg/otr4j
otr4j: update to 0.22
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java')
0 files changed, 0 insertions, 0 deletions