From 04a5e96233fab60566a6f1b1e72699a09fdd1da6 Mon Sep 17 00:00:00 2001
From: Carsten Schmitz <carsten.schmitz@limesurvey.org>
Date: Thu, 17 Dec 2015 09:15:53 +0100
Subject: [PATCH] Dev Adjusted ignored files

---
 .gitignore | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index ece3b6812e0..35bf1630e28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,8 @@
 /upload/surveys/*
 /styles/gringegreen/images/Thumbs.db
 /upload/templates/*
+/upload/labels/*
+!/upload/labels/readme.txt
 /tmp/runtime/HTML
 /application/controllers/admin/updater.php
 /tmp/*.html
@@ -14,8 +16,8 @@
 /upload/.htaccess
 /nbproject
 /tmp/assets/*
-/tmp/assets/!.gitignore
-/tmp/assets/!index.html
+!/tmp/assets/.gitignore
+!/tmp/assets/index.html
 /tmp/runtime/cache/*
 /framework
 .svn