Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib |
||
|---|---|---|
| .. | ||
| arrays.xml | ||
| attrs.xml | ||
| colors.xml | ||
| strings.xml | ||
| styles.xml | ||
| themes.xml | ||
Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib |
||
|---|---|---|
| .. | ||
| arrays.xml | ||
| attrs.xml | ||
| colors.xml | ||
| strings.xml | ||
| styles.xml | ||
| themes.xml | ||