diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-07-15 17:11:59 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-07-15 17:11:59 +0200 |
| commit | 6f5d7071afe00a8c248baf83b8273314ece0c622 (patch) | |
| tree | bea807b35ecc998dbdca0839a46e4617c161968c /proguard-project.txt | |
| parent | 2a82f23f36e56fa18c59d48231b886edd26a3425 (diff) | |
| parent | 908bd59d21cc98a8c112ad5ffc8ec59063ffe8c9 (diff) | |
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'proguard-project.txt')
0 files changed, 0 insertions, 0 deletions