Tags: quwepiro/Shuttle
Tags
Merge pull request timusus#504 from asdoi/master_fdroid New f-droid master
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
PreviousNext