Merge branch 'cherry-pick-develop' into 'master'
Cherry pick develop See merge request funkwhale/funkwhale!680
Showing
- docs/moderator/users.rst 82 additions, 0 deletionsdocs/moderator/users.rst
- docs/users/apps.rst 6 additions, 0 deletionsdocs/users/apps.rst
- docs/users/create.rst 23 additions, 0 deletionsdocs/users/create.rst
- docs/users/favorites.rst 41 additions, 0 deletionsdocs/users/favorites.rst
- docs/users/follow.rst 60 additions, 0 deletionsdocs/users/follow.rst
- docs/users/index.rst 30 additions, 9 deletionsdocs/users/index.rst
- docs/users/managing.rst 47 additions, 0 deletionsdocs/users/managing.rst
- docs/users/playlists.rst 121 additions, 0 deletionsdocs/users/playlists.rst
- docs/users/queue.rst 64 additions, 0 deletionsdocs/users/queue.rst
- docs/users/radios.rst 52 additions, 0 deletionsdocs/users/radios.rst
- docs/users/troubleshooting.rst 107 additions, 0 deletionsdocs/users/troubleshooting.rst
- docs/users/upload.rst 17 additions, 7 deletionsdocs/users/upload.rst
- front/src/components/Home.vue 1 addition, 1 deletionfront/src/components/Home.vue
- front/src/components/library/FileUpload.vue 13 additions, 0 deletionsfront/src/components/library/FileUpload.vue
- front/src/components/library/Home.vue 2 additions, 2 deletionsfront/src/components/library/Home.vue
- front/src/filters.js 9 additions, 1 deletionfront/src/filters.js
- front/src/main.js 10 additions, 21 deletionsfront/src/main.js
- front/src/style/_main.scss 30 additions, 5 deletionsfront/src/style/_main.scss
- front/src/style/vendor/_media.scss 2 additions, 1 deletionfront/src/style/vendor/_media.scss
- front/src/views/content/libraries/FilesTable.vue 1 addition, 1 deletionfront/src/views/content/libraries/FilesTable.vue
Loading
Please register or sign in to comment