Merge develop into 1206-events-template - restore gitignore
This commit is contained in:
parent
7dc5fc8b9f
commit
d0900c5389
1 changed files with 0 additions and 13 deletions
13
.gitignore
vendored
13
.gitignore
vendored
|
@ -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
|
|
||||||
|
|
Loading…
Reference in a new issue