This repository has been archived by the owner on Dec 28, 2022. It is now read-only.
v2.0.13-beta1: Merge branch 'master' into dev
# Conflicts: # .idea/codeStyles/Project.xml # app/src/main/assets/web/info.html # app/src/main/assets/web/info_dark.html # app/src/main/java/com/simplecity/amp_library/model/Playlist.java # app/src/main/java/com/simplecity/amp_library/notifications/MusicNotificationHelper.java # app/src/main/java/com/simplecity/amp_library/ui/dialog/ChangelogDialog.java # buildSrc/src/main/kotlin/Config.kt