diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2015-08-23 19:44:58 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2015-08-23 19:44:58 +0200 |
commit | 91a3cee6d2ddcb647082b517d2781c00fb1f844d (patch) | |
tree | 598bd481c95f99119a5bae4b189e4e6ed32863d5 /libs/MemorizingTrustManager/proguard-project.txt | |
parent | 412efe93c0988e3a130bac35802fca139787d68a (diff) | |
parent | 8043833156119eef4662c50f30ca647bfc6d4438 (diff) |
Merge branch 'master' into development
Diffstat (limited to 'libs/MemorizingTrustManager/proguard-project.txt')
0 files changed, 0 insertions, 0 deletions