From d0900c5389dc2b0a753d7d022928f569951b81e2 Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Fri, 17 Jun 2016 14:35:24 +0200
Subject: [PATCH] Merge develop into 1206-events-template - restore gitignore

---
 .gitignore | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 77151060d..b300f579e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,16 +42,3 @@ nbproject
 
 #ignore local folder
 /local/
-
-#other stuff
-.directory
-.gitignore
-
-/view/theme/Friendiboot
-/view/theme/Viereinhalb
-/view/theme/blog
-/view/theme/boheme
-/view/theme/clean
-/view/theme/suckerberg
-
-/addon/frio_hovercard