Merge branch 'transcoding_progress'

[mediagoblin.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index a38c65a96aae4467f1e358b4fb49829a02c808a7..acb9a3b21a0c59dc1fab5f742635a2358f4d3e3b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -26,9 +26,11 @@
 /celerybeat-schedule
 /server-log.txt
 *.egg/
+/.eggs/
 /env
 /mediagoblin.ini
 /node_modules/
+/pip-selfcheck.json
 
 # pyconfigure/automake generated files
 /Makefile
@@ -48,6 +50,7 @@
 *~
 *.swp
 *.mo
+*.patch
 
 # The legacy of buildout
 .installed.cfg
@@ -61,3 +64,4 @@ venv*
 /extlib/leaflet/
 /extlib/tinymce/
 /extlib/video.js/
+/extlib/videojs-resolution-switcher