diff options
| author | iNPUTmice <daniel@gultsch.de> | 2015-04-14 15:17:26 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2015-04-14 15:17:26 +0200 |
| commit | b6cc8c90a00f55866ea906697a40f582643309c2 (patch) | |
| tree | b220ef33d771667032a1cc2c62b0587a09a27ff9 /proguard-project.txt | |
| parent | 261b505f066b90ef346c529afea50f8285ddfd7d (diff) | |
| parent | defb127d6e3a1d29f60553a8e9b3f992f2127b70 (diff) | |
Merge branch 'BrianBlade-dont_trust_cas_preference' into development
Diffstat (limited to 'proguard-project.txt')
0 files changed, 0 insertions, 0 deletions