Merge branch 'master' into homeFragment
# Conflicts:
#	app/src/main/java/org/ntlab/acanthus_client/entities/AnimationJson.java
commit 1f17ef18a0dadf76299c8c5eb886e898861f59b2
2 parents 0e8cf31 + e295c68
h-fuji authored on 2 Jul 2021
Showing 1 changed file
View
app/src/main/java/org/ntlab/acanthus_client/entities/AnimationJson.java