From da49eeda6e719d7d9449fcb4cfaed2464100221c Mon Sep 17 00:00:00 2001
From: "Moritz Kaspar Rudert (mortzu)" <me@mortzu.de>
Date: Mon, 8 Sep 2014 08:17:19 +0200
Subject: merged gitignore files

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index b2b7f713..30785b84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,4 @@
 .*.swp
 _vimrc_local.vim
 .sass-cache
-
+config/config.php
-- 
cgit v1.2.3-54-g00ecf