Merge branch 'draft' of https://gitlab.com/Arisono/SkWeiChat-Baidu into uu_v1.0 · bbb8e79c93 - Gogs

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

# Conflicts:
#	WeiChat/src/main/AndroidManifest.xml
#	app_core/message/build.gradle
#	settings.gradle

SpringBoots 8 years ago

parent

374fdd727d

commit

bbb8e79c93

1 changed files with 321 additions and 322 deletions

Split View Show Diff Stats

				
					File diff suppressed because it is too large
					
						+ 321
						
						- 322
					
WeiChat/src/main/AndroidManifest.xml