Merge remote-tracking branch 'swiftfork/main'

Browse source

# Conflicts:
#	src/renderer/views/components/add-to-playlist.ejs

...

This commit is contained in:

Swiftzerr 2022-01-29 21:57:17 -05:00

parent d1b9b6a1bd 85df0bf244

commit bde33c4324

175 changed files with 35181 additions and 23240 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1348

src/renderer/index.js

View file

File diff suppressed because it is too large Load diff