Merge develop into 1206-events-template - restore gitignore

This commit is contained in:
rabuzarus 2016-06-17 14:35:24 +02:00
parent 7dc5fc8b9f
commit d0900c5389

13
.gitignore vendored
View file

@ -42,16 +42,3 @@ nbproject
#ignore local folder #ignore local folder
/local/ /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