Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/cuong-tran/komikku
# Conflicts: # .github/ISSUE_TEMPLATE.md # .github/readme-images/app-icon.png # .idea/icon.png # README.md # app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml # app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml # app/src/debug/res/mipmap-hdpi/ic_launcher.png # app/src/debug/res/mipmap-hdpi/ic_launcher_round.png # app/src/debug/res/mipmap-mdpi/ic_launcher.png # app/src/debug/res/mipmap-mdpi/ic_launcher_round.png # app/src/debug/res/mipmap-xhdpi/ic_launcher.png # app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png # app/src/debug/res/mipmap-xxhdpi/ic_launcher.png # app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png # app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png # app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png # app/src/main/ic_launcher-web.png # app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml # app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml # app/src/main/res/mipmap-hdpi/ic_launcher.png # app/src/main/res/mipmap-hdpi/ic_launcher_round.png # app/src/main/res/mipmap-mdpi/ic_launcher.png # app/src/main/res/mipmap-mdpi/ic_launcher_round.png # app/src/main/res/mipmap-xhdpi/ic_launcher.png # app/src/main/res/mipmap-xhdpi/ic_launcher_round.png # app/src/main/res/mipmap-xxhdpi/ic_launcher.png # app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png # app/src/main/res/mipmap-xxxhdpi/ic_launcher.png # app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
- Loading branch information