app/src/main/res/layout · 1b1304fdcac5741199fc24ae43dd4960efaa3b4d · android / android_freeworld · GitLab

History Find file

Merge remote-tracking branch 'origin/master' · e4e5948d

张释方 authored Jul 05, 2021

# Conflicts:
#	app/src/main/res/values/styles.xml
#	library_ad/build.gradle
#	library_base/version.properties

e4e5948d

Name	Last commit	Last update
..
activity_login.xml		Loading commit data...
activity_main.xml		Loading commit data...
fragment_home.xml		Loading commit data...
fragment_my.xml		Loading commit data...
fragment_square.xml		Loading commit data...
fragment_take.xml		Loading commit data...
fragment_take_photo.xml		Loading commit data...
header_layout.xml		Loading commit data...
include_header.xml		Loading commit data...
item_empty.xml		Loading commit data...
item_friends_recy.xml		Loading commit data...
item_recy_invited.xml		Loading commit data...