Merge branch 'feature_bitliker' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature · 8547a354ca - Gogs

Sfoglia il codice sorgente

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

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java
#	WeiChat/version.properties

Arison 7 anni fa

parent

ab5b58ba80

commit

8547a354ca

1 ha cambiato i file con 3 aggiunte e 3 eliminazioni

Visualizzazione separata Mostra Diff Stats

						
							+ 3
							
							- 3
						
WeiChat/version.properties
							 
								Vedi File
							
				@@ -1,5 +1,5 @@
			
				-#Tue May 08 19:26:29 CST 2018
			
				-debugName=222
			
				+#Thu May 10 16:08:39 CST 2018
			
				+debugName=224
			
				 versionName=629
			
				-debugCode=222
			
				+debugCode=224
			
				 versionCode=169