aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/menu/verify_otr.xml
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-10-20 18:18:25 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-10-20 18:18:25 +0200
commitf2696b66ba12f014617bc28c3db1c525f2bfe4f5 (patch)
tree6eb0fa9202b071512138b1b6fcce4d7e49b7dc60 /src/main/res/menu/verify_otr.xml
parent52d4be4249dfa7ca77042a14b3841c274bdcf626 (diff)
parentfd4e15ba976fc837a248d7513ab5ed39d24a92e6 (diff)
Merge branch 'feature-remove-merge-separator' of https://github.com/Mishiranu/Conversations into Mishiranu-feature-remove-merge-separator
Diffstat (limited to 'src/main/res/menu/verify_otr.xml')
0 files changed, 0 insertions, 0 deletions