| Merge branch 'master' into animationDetail | 
|---|
| .idea/gradle.xml | 
|---|
| .idea/misc.xml | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/entities/FollowAddJson.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/entities/FollowUidJson.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/entities/FollowerUidJson.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintToolBar.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/PenDetailsFragment.java 0 → 100644 | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageViewModel.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/userpage/followList/FollowListActivity.java 0 → 100644 | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/userpage/followList/FollowListFragment.java 100644 → 0 | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/userpage/followerList/FollowerListActivity.java 0 → 100644 | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/userpage/followerList/FollowerListFragment.java 100644 → 0 | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/userpage/workList/WorkListActivity.java 0 → 100644 | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/userpage/workList/WorkListFragment.java 100644 → 0 | 
|---|
| app/src/main/res/drawable/flame_style.xml 0 → 100644 | 
|---|
| app/src/main/res/layout/activity_follow_list.xml 0 → 100644 | 
|---|
| app/src/main/res/layout/activity_follower_list.xml 0 → 100644 | 
|---|
| app/src/main/res/layout/activity_work_list.xml 0 → 100644 | 
|---|
| app/src/main/res/layout/fragment_edit.xml | 
|---|
| app/src/main/res/layout/fragment_home.xml | 
|---|