Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	src/app/modules/songs/song/edit/edit-song/edit-song.component.html
#	src/app/modules/songs/song/edit/edit-song/edit-song.component.less

...

This commit is contained in:

smuddyx

2020-06-01 16:06:26 +02:00

parent 0a8f6dd241 315a0a6007

commit 634edec169

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

Diff Content Not Available