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

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

# Conflicts:
#	WeiChat/version.properties
#	app_core/common/src/main/java/com/common/LogUtil.java

Arison 7 years ago

parent

747f9f29c4

commit

dba23f32fd

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 @@
			
				-#Thu Feb 08 17:38:33 CST 2018
			
				-debugName=445
			
				+#Thu Feb 08 17:49:38 CST 2018
			
				+debugName=446
			
				 versionName=613
			
				-debugCode=445
			
				+debugCode=446
			
				 versionCode=152