Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature · 11dff7b17b - Gogs

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

# Conflicts:
#	WeiChat/version.properties

Arison 8 years ago

parent

2819b2fe17

commit

11dff7b17b

1 changed files with 3 additions and 3 deletions

Split View Show Diff Stats

						
							+ 3
							
							- 3
						
WeiChat/version.properties
							 
								View File
							
				@@ -1,5 +1,5 @@
			
				-#Tue Jan 09 13:53:40 CST 2018
			
				-debugName=18
			
				+#Tue Jan 09 15:34:36 CST 2018
			
				+debugName=20
			
				 versionName=611
			
				-debugCode=18
			
				+debugCode=20
			
				 versionCode=150