Merge branch 'list_margin' into animation_background
# Conflicts:
#	.idea/misc.xml
commit d459df8d32d3bef0ab6c048c79f7cb2d7bea0aa8
2 parents 24fa8e2 + a62686f
parsecmonkey authored on 28 Oct 2021
Showing 6 changed files
View
.idea/misc.xml
View
app/src/main/res/layout/animation_home.xml
View
app/src/main/res/layout/animation_home_header.xml
View
app/src/main/res/layout/fragment_edit.xml
View
app/src/main/res/layout/fragment_home.xml
View
app/src/main/res/layout/work_list.xml