Merge remote-tracking branch 'origin/big_changes'
# Conflicts: # app/src/main/java/io/eelo/appinstaller/application/ApplicationActivity.kt # app/src/main/java/io/eelo/appinstaller/application/model/ApplicationData.kt # app/src/main/java/io/eelo/appinstaller/categories/category/model/CategoryModel.kt # app/src/main/java/io/eelo/appinstaller/categories/model/CategoriesModel.kt # app/src/main/java/io/eelo/appinstaller/home/HomeFragment.kt # app/src/main/java/io/eelo/appinstaller/search/SearchFragment.kt # app/src/main/java/io/eelo/appinstaller/updates/UpdatesFragment.kt
Loading
Please register or sign in to comment