Merge branch 'master' into kuraokaLocalPOSTID
|
---|
.idea/gradle.xml |
---|
.idea/misc.xml |
---|
app/src/main/java/org/ntlab/acanthus_client/entities/Animation.java |
---|
app/src/main/java/org/ntlab/acanthus_client/entities/Stroke.java |
---|
app/src/main/java/org/ntlab/acanthus_client/resources/accounts/FollowsRest.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailActivity.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/res/drawable/flame_style.xml 0 → 100644 |
---|
app/src/main/res/layout/fragment_edit.xml |
---|
app/src/main/res/layout/fragment_home.xml |
---|