GitBucket
|
Merge branch 'animationDetail' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2021/org.ntlab.acanthus_client
Conflicts: app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailActivity.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/ListEditorsViewAdapter.java 0 → 100644 |
|---|
| app/src/main/res/layout/activity_animation_detail.xml |
|---|
| app/src/main/res/layout/animation_detail.xml 0 → 100644 |
|---|