Merge branch 'master' of w00d5t0ck.info:blueroses

2012-08-22 11:50:56 +02:00
parent 7b7e9dac8d bec75018be
commit 013d79e613
13 changed files with 210 additions and 192 deletions
--- a/web/bundles/.gitignore
+++ b/web/bundles/.gitignore
@@ -1,2 +0,0 @@
-*
-!.git*
--- a/web/css/.gitignore
+++ b/web/css/.gitignore
@@ -1,2 +0,0 @@
-*
-!.git*
--- a/web/js/.gitignore
+++ b/web/js/.gitignore
@@ -1,4 +0,0 @@
-*
-!.git*
-!jquery-cluetip
-!jquery-form
--- a/web/upload/.gitignore
+++ b/web/upload/.gitignore
@@ -1,2 +0,0 @@
-*
-!.git*
--- a/web/upload/.gitkeep
+++ b/web/upload/.gitkeep
@@ -0,0 +1 @@
+SymfonyRequirements.php