Merge branch 'master' into webseed-merged

[github/Chocobozzz/PeerTube.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 50248f5e576a4f6162196bf13b5b82c47ae1b782..7ca89dca8532625749c8e09c466040913187a17b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,4 @@
-*.komodoproject
 node_modules
-.tmp
-public/javascripts/bundle.js
 schemes/
 certs/
 logs/
@@ -13,3 +10,15 @@ test5/
 test6/
 public/stylesheets/global.css
 public/stylesheets/vendor
+uploads
+thumbnails
+config/production.yaml
+ffmpeg
+<<<<<<< HEAD
+torrents
+=======
+.tags
+*.sublime-project
+*.sublime-workspace
+torrents/
+>>>>>>> master