Merge branch 'master' into feature/create_StrokeRest
|
---|
app/src/main/java/org/ntlab/acanthus_client/resources/accounts/WorkRest.java |
---|
app/src/main/java/org/ntlab/acanthus_client/resources/gallery/EditorsRest.java |
---|
app/src/main/java/org/ntlab/acanthus_client/resources/gallery/GalleryRest.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/search/SearchFragment.java |
---|
app/src/main/res/layout/fragment_search.xml |
---|