nextcloud-android/res/values-de-rDE
David A. Velasco 053aad5ae1 Merge branch 'bug_hunting' into feature_previews
Conflicts:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
2013-04-04 16:49:04 +02:00
..
strings.xml Merge branch 'bug_hunting' into feature_previews 2013-04-04 16:49:04 +02:00