Merge branch 'master' into inviteActivity
|
---|
.idea/misc.xml |
---|
app/src/main/java/org/ntlab/acanthus_client/entities/FollowJson.java |
---|
app/src/main/java/org/ntlab/acanthus_client/entities/FollowerJson.java |
---|
app/src/main/java/org/ntlab/acanthus_client/resources/gallery/StrokesRest.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationCanvas.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationConnectionModel.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationViewModel.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/userpage/followList/FollowListActivity.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/userpage/followerList/FollowerListActivity.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/userpage/workList/WorkListActivity.java |
---|
app/src/main/res/layout/activity_animation.xml |
---|
app/src/main/res/layout/activity_main.xml |
---|