summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorctrlaltca <ctrlaltca@gmail.com>2013-11-26 03:01:40 -0800
committerctrlaltca <ctrlaltca@gmail.com>2013-11-26 03:01:40 -0800
commita4e4839d9f09d27b6f0cba92fad0231632b3a04d (patch)
tree2a2f353f2f7b0fd6cde035068a2036ab630f688b /.gitignore
parent2b11341614ac4a15be697fa8acad07055154ac54 (diff)
parent65adcbec2cc9a00a5b0611e34c7141bf4e6d63f7 (diff)
Merge pull request #491 from pradosoft/jquery
Main development switch to 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