diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-12-02 16:38:33 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-12-02 16:38:33 +0100 |
| commit | aa21797f430e6fe21655addfa43e14d75018834f (patch) | |
| tree | dcedf3b90f4e2bc00dedeeea69cc7500772fe5b5 /libs/MemorizingTrustManager/res/values | |
| parent | 025cbf7d44f72544155e4074ef754d750bd86b2c (diff) | |
| parent | 0eaf7669f74f33fc9898a8acc8913140276aadd9 (diff) | |
Merge branch 'master' of github.com:siacs/Conversations
Diffstat (limited to 'libs/MemorizingTrustManager/res/values')
0 files changed, 0 insertions, 0 deletions