Merge branch 'master' into feature/atv

# Conflicts:
#	lib/ui/player_screen.dart
#	lib/ui/search.dart
This commit is contained in:
kilowatt 2020-11-30 20:21:21 +03:00
commit 1ea904ec8d
34 changed files with 1755 additions and 486 deletions

2
.gitignore vendored
View file

@ -2,6 +2,8 @@
freezerkey.jsk
android/key.properties
just_audio/
# Miscellaneous
*.class
*.log