diff options
| author | iNPUTmice <daniel@gultsch.de> | 2015-04-14 15:17:06 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2015-04-14 15:17:06 +0200 |
| commit | defb127d6e3a1d29f60553a8e9b3f992f2127b70 (patch) | |
| tree | b220ef33d771667032a1cc2c62b0587a09a27ff9 /settings.gradle | |
| parent | 261b505f066b90ef346c529afea50f8285ddfd7d (diff) | |
| parent | 878066ca99c1170479fb217d68ecdb9cf5498975 (diff) | |
Merge branch 'dont_trust_cas_preference' of https://github.com/BrianBlade/Conversations into BrianBlade-dont_trust_cas_preference
Conflicts:
src/main/res/values-de/strings.xml
src/main/res/values/strings.xml
Diffstat (limited to 'settings.gradle')
0 files changed, 0 insertions, 0 deletions