Merge branch 'release' of ssh://10.10.100.21/source/uu-android into feature_arison · 0cdf36a2c5 - Gogs

Merge branch 'release' of ssh://10.10.100.21/source/uu-android into feature_arison

# Conflicts:
#	WeiChat/version.properties

Arison 6 years ago

parent

0b39e883d4

commit

0cdf36a2c5

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 @@
			
				-#Mon Aug 26 17:28:30 CST 2019
			
				+#Mon Sep 09 15:33:10 CST 2019
			
				 debugName=972
			
				-versionName=695
			
				+versionName=696
			
				 debugCode=972
			
				-versionCode=250
			
				+versionCode=251