merged gitignore files

This commit is contained in:
Moritz Kaspar Rudert (mortzu) 2014-09-08 08:17:19 +02:00
parent 5d8615a958
commit da49eeda6e
2 changed files with 1 additions and 2 deletions

2
.gitignore vendored
View File

@ -4,4 +4,4 @@
.*.swp
_vimrc_local.vim
.sass-cache
config/config.php

1
config/.gitignore vendored
View File

@ -1 +0,0 @@
config.php