diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-09-19 17:21:46 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-09-19 17:21:46 +0200 |
| commit | 1d23c7e7fbe146a956d55077a99f357d41b6a502 (patch) | |
| tree | bfb3c40de2e6450ea5c38757843d87e1892c2715 /AndroidManifest.xml | |
| parent | 2a185c8fc97ad82525ae18efe67026019d04442d (diff) | |
| parent | bf8f67ef718ab33b7f9098a019d434aef0b2a48f (diff) | |
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions