Merge branch 'transcoding_progress'

[mediagoblin.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 2b21a4bde4a6a14173af17fcb25f8af1b496ce61..acb9a3b21a0c59dc1fab5f742635a2358f4d3e3b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -26,9 +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
@@ -43,6 +49,8 @@
 *.pyo
 *~
 *.swp
+*.mo
+*.patch
 
 # The legacy of buildout
 .installed.cfg
@@ -50,3 +58,10 @@
 # Virtualenv, tox
 venv*
 .tox/
+
+# extlib things
+/extlib/jquery/
+/extlib/leaflet/
+/extlib/tinymce/
+/extlib/video.js/
+/extlib/videojs-resolution-switcher