X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.gitignore;h=9dc03a6a1f09451b4f8ec23785e7af1d22645a03;hb=a16aee73db627908dc83eb5c29b213ce8d1fab39;hp=7ca89dca8532625749c8e09c466040913187a17b;hpb=aff36eb063573532498979c83be1c279c84f2d53;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/.gitignore b/.gitignore
index 7ca89dca8..9dc03a6a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,24 +1,24 @@
-node_modules
-schemes/
-certs/
-logs/
-test1/
-test2/
-test3/
-test4/
-test5/
-test6/
-public/stylesheets/global.css
-public/stylesheets/vendor
-uploads
-thumbnails
-config/production.yaml
-ffmpeg
-<<<<<<< HEAD
-torrents
-=======
-.tags
-*.sublime-project
-*.sublime-workspace
+/node_modules/
+/test1/
+/test2/
+/test3/
+/test4/
+/test5/
+/test6/
+/storage/
+/config/production.yaml
+/config/local*
+/ffmpeg/
+/*.sublime-project
+/*.sublime-workspace
+/dist
+/.idea
+/PeerTube.iml
+peertube.zip
+/profiling/
+/*.zip
+thumbnails/
 torrents/
->>>>>>> master
+videos/
+previews/
+logs/