diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-12-19 13:40:35 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-12-19 13:40:35 +0100 |
| commit | a68cb5d3643dc9ab5c37ade8defc109cc44e8557 (patch) | |
| tree | c725fbceb880b9f44da65368901ffbc14e91d917 /src/main/AndroidManifest.xml | |
| parent | 627982df90d83177578183d0e91cad0a748c4e4d (diff) | |
| parent | 11cb06eda56640c99c4201518261e59a616b15cd (diff) | |
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/main/AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions