mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 04:43:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'campaigns'

Browse source 
Conflicts:
	commons/res/values/strings.xml
	commons/src/main/java/org/wikimedia/commons/Media.java

Change-Id: Ib8c74cbf88630f11b3fbfee903800e7acf7b2fd4
This commit is contained in:
YuviPanda 2013-10-15 22:54:03 +05:30
commit 064dbb0df6
32 changed files with 1374 additions and 462 deletions
Download patch file Download diff file Expand all files Collapse all files

1
commons/res/values/strings.xml
View file

@ -138,4 +138,5 @@
<string name="detail_panel_cats_label">Categories</string>
<string name="detail_panel_cats_loading">Loading...</string>
<string name="detail_panel_cats_none">None selected</string>
<string name="provider_campaigns">Campaigns</string>
</resources>