diff options
| author | Sam Whited <sam@samwhited.com> | 2014-10-30 15:20:20 -0400 |
|---|---|---|
| committer | Sam Whited <sam@samwhited.com> | 2014-10-30 15:33:13 -0400 |
| commit | 46f147a82c6b161e071f717c7686f8b78a20aaf1 (patch) | |
| tree | 38ee04006e38197fd8009697b8975007ec0f45c8 /src/main/res/values-ca | |
| parent | 142384e5805d93887d185c9a5b74d4850e4ec719 (diff) | |
| parent | a362bd10214b16f8939c12a1dd4376667fe0d49f (diff) | |
Merge branch 'gradle' into development
Conflicts:
.gitignore
CHANGELOG.md
README.md
libs/MemorizingTrustManager
libs/minidns
libs/openpgp-api-lib
Diffstat (limited to '')
| -rw-r--r-- | src/main/res/values-ca/arrays.xml (renamed from res/values-ca/arrays.xml) | 0 | ||||
| -rw-r--r-- | src/main/res/values-ca/strings.xml (renamed from res/values-ca/strings.xml) | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/res/values-ca/arrays.xml b/src/main/res/values-ca/arrays.xml index ff1a0d4b..ff1a0d4b 100644 --- a/res/values-ca/arrays.xml +++ b/src/main/res/values-ca/arrays.xml diff --git a/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index cfbe428b..cfbe428b 100644 --- a/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml |