aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values-ca/strings.xml
diff options
context:
space:
mode:
authorSam Whited <sam@samwhited.com>2014-10-30 15:20:20 -0400
committerSam Whited <sam@samwhited.com>2014-10-30 15:33:13 -0400
commit46f147a82c6b161e071f717c7686f8b78a20aaf1 (patch)
tree38ee04006e38197fd8009697b8975007ec0f45c8 /src/main/res/values-ca/strings.xml
parent142384e5805d93887d185c9a5b74d4850e4ec719 (diff)
parenta362bd10214b16f8939c12a1dd4376667fe0d49f (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/strings.xml (renamed from res/values-ca/strings.xml)0
1 files changed, 0 insertions, 0 deletions
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