Merge pull-request #492

2016-02-28 14:24:01 -05:00 · 2016-02-28 14:24:01 -05:00 · 597c478869
commit 597c478869
parent ee805bebfc edc1721c30
1 changed files with 12 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -40,6 +40,17 @@ Thumbs.db
 *.lock
 *.out

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