summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorFabio Bas <ctrlaltca@gmail.com>2013-11-26 11:43:27 +0100
committerFabio Bas <ctrlaltca@gmail.com>2013-11-26 11:43:27 +0100
commit65adcbec2cc9a00a5b0611e34c7141bf4e6d63f7 (patch)
tree2a2f353f2f7b0fd6cde035068a2036ab630f688b /.gitignore
parenta1983c5f49f5ec95da2d3848a0250771a870534d (diff)
parent5632770c86d30361fe0c3eefc7d327786b478702 (diff)
Merge branch 'jquery' of https://github.com/pradosoft/prado into jquery
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 93cbf3f5..d1850cff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,4 +33,5 @@ bin/coveralls
bin/dbunit.php
#OSX
-.DS_Store \ No newline at end of file
+.DS_Store
+/nbproject/private/ \ No newline at end of file