Merge branch 'master' into ShopActivity
commit 99a79ac080de7ecd5fb0d988e6bd9eab4e143b65
2 parents 68d7b69 + 24e130d
k-fujii authored on 10 Oct
Showing 5 changed files
View
app/src/main/java/com/example/nemophila/entities/ErrorType.java
View
app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java
View
app/src/main/java/com/example/nemophila/viewmodels/FriendViewModel.java
View
app/src/main/java/com/example/nemophila/viewmodels/PostsViewModel.java
View
app/src/main/java/com/example/nemophila/viewmodels/ShopsViewModel.java