From: Loic Baron <loic.baron@lip6.fr>
Date: Sun, 13 Oct 2013 19:26:50 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: myslice-0.2-5~8
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=eb0560f0df8bf3bb0406186ec39e6762d5477684;hp=554920a7c6175e1ade92c1de2fee0f5e5c372fdf;p=unfold.git

Merge branch 'master' of ssh://git.onelab.eu/git/myslice
---

diff --git a/.gitignore b/.gitignore
index 2f9285bb..db80e62e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,9 +9,11 @@ TAGS
 # these essentially are copies/links from other places
 /static/
 /templates/
-# various working files
-play/
-*.leftovers
-*.hide
-entrypoints.ongoing/
+# sequels of running setup.py
 build/
+# css, js and html stuff for plugins should comply with
+# the general django layout (templates/ and statics/{css,js}/)
+# however symlinks can be convenient in a work tree
+plugins/*/*.css
+plugins/*/*.js
+plugins/*/*.html