Merge branch 'next' of github.com:diced/zipline into next

src/pages/dash/upload.tsx

@@ -92,7 +92,7 @@ export default function Upload() {
             </Typography>
             <Box m={1}>
               <DropzoneArea
-                acceptedFiles={['image/*']}
+                acceptedFiles={['image/*', 'video/*']}
                 dropzoneText={'Drag an image or click to upload an image.'}
                 onChange={f => setFiles(f)}
                 filesLimit={1}
@@ -106,4 +106,4 @@ export default function Upload() {
     );
   }
   return <UIPlaceholder />;
-}
+}