Merge branch 'master' into kuraoka_コード修正

Fork: 0

nitta-lab-2021 / org.ntlab.acanthus_client

Browse code Merge branch 'master' into kuraoka_コード修正 # Conflicts: # app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java README master
commit 2a5478ca06a570c752030a791f48077c03fe7e84 2 parents 8c59228 + 60f5a56 Kryosuke authored on 30 Jul 2021

Patch

Unified Split

Showing 12 changed files

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/entities/FollowAddJson.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/entities/FollowUidJson.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/entities/FollowerUidJson.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/resources/accounts/FollowersRest.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/resources/accounts/FollowsRest.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java

Ignore Space Show notes View app/src/main/res/layout/activity_main.xml

Ignore Space Show notes View app/src/main/res/layout/activity_sign_up.xml

Ignore Space Show notes View app/src/main/res/layout/animation_home.xml

Ignore Space Show notes View app/src/main/res/layout/fragment_edit.xml

Ignore Space Show notes View app/src/main/res/layout/fragment_search.xml

Show line notes below