Merge branch 'transcoding_progress'

[mediagoblin.git] / .gitignore

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