nextcloud-android/res/values-ca
David A. Velasco 7edbe05bb5 Merge remote-tracking branch 'origin/master'
Conflicts:
	res/values-ca/strings.xml
	res/values-el/strings.xml
2012-10-08 09:10:37 +02:00
..
strings.xml Merge remote-tracking branch 'origin/master' 2012-10-08 09:10:37 +02:00