Merge branch 'master' into subscribe_to_channel_and_playlist

This commit is contained in:
Tzahi12345
2020-03-05 22:57:57 -05:00
committed by GitHub
12 changed files with 331 additions and 6 deletions

3
.gitignore vendored
View File

@@ -52,4 +52,7 @@ backend/subscriptions/archives/*
backend/subscriptions/playlists/*
backend/subscriptions/channels/*
backend/db.json
backend/subscriptions/channels/*
backend/subscriptions/playlists/*
backend/subscriptions/archives/*
src/assets/default.json