Merge branch 'dev' of ssh://git.auf.org/auf_rh_dae into dev
[auf_rh_dae.git] / .gitignore
index af12a2f..cb060fe 100644 (file)
@@ -29,3 +29,11 @@ eggs
 log
 parts
 tmp
+
+# extra
+project/media_prive/*
+<<<<<<< HEAD
+project/static/*
+=======
+project/static
+>>>>>>> master