aboutsummaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-06-02 21:27:58 +0200
committeriNPUTmice <daniel@gultsch.de>2014-06-02 21:27:58 +0200
commit3db0f688fb699164a2ecb94754041cb4dd28d971 (patch)
tree689c4b0828c4199abc3659fc7c696ad72c59cf02 /AndroidManifest.xml
parent5b6140dc645200fbc4d63c65cb8c28e824b2b6d0 (diff)
parent7e1e080eb6330fc17b5857212c0c708eb0bcb289 (diff)
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions