Merge branch 'master' into feature/get_pre_canvas
|
---|
.idea/misc.xml |
---|
app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailActivity.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailViewModel.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java |
---|
app/src/main/res/layout/activity_animation.xml |
---|
app/src/main/res/layout/activity_animation_detail.xml |
---|
app/src/main/res/layout/activity_follow_list.xml |
---|
app/src/main/res/layout/activity_follower_list.xml |
---|
app/src/main/res/layout/activity_invite.xml |
---|
app/src/main/res/layout/activity_userpage.xml |
---|
app/src/main/res/layout/follow_or_follower_list.xml |
---|
app/src/main/res/layout/fragment_edit.xml |
---|