Merge branch 'draft' of https://gitlab.com/Arisono/SkWeiChat-Baidu into update_version · a3e58bd61a - Gogs

Merge branch 'draft' of https://gitlab.com/Arisono/SkWeiChat-Baidu into update_version

# Conflicts:
#	WeiChat/src/main/res/values-en/strings.xml
#	WeiChat/src/main/res/values/strings.xml

SpringBoots 8 years ago

parent

d2bd80c75f

commit

a3e58bd61a

1 changed files with 1 additions and 0 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 0
						
WeiChat/src/main/res/values-en/strings.xml
							 
								View File
							
				@@ -2297,4 +2297,5 @@
			
				         <item>禁言半个月</item>
			
				         <item>禁言一个月</item>
			
				     </string-array>
			
				+    <string name="common_list_empty">No data</string>
			
				 </resources>