diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-05-31 11:55:24 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-05-31 11:55:24 +0200 |
| commit | 15096aa0dd07422bee1c02bb4a60d89bd96d07fc (patch) | |
| tree | 911453d9fa7c07fb067f1115702724d36a2e4885 /proguard-project.txt | |
| parent | 57ded7ee588111a4cbe2a4481b56610aa913507a (diff) | |
| parent | 1ffba8bd62d34e43611896b12c1cb6f3fa0542d8 (diff) | |
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'proguard-project.txt')
0 files changed, 0 insertions, 0 deletions