Merge pull-request #492

This commit is contained in:
Frederic Guillot 2016-02-28 14:24:01 -05:00
commit 597c478869

12
.gitignore vendored
View File

@ -40,6 +40,17 @@ Thumbs.db
*.lock *.lock
*.out *.out
# IDE generated files #
######################
.idea
.buildpath
.project
.settings
*.sublime-project
*.sublime-workspace
.nbproject
nbproject
# App specific # # App specific #
################ ################
config.php config.php
@ -47,3 +58,4 @@ config.php
!controllers/* !controllers/*
rules/*.php rules/*.php
data/favicons/*.* data/favicons/*.*
/nbproject/private/