Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 51ac39e6f29f103367ad7ef80db8d1f8a7b28ed8..00383151a6401dfbfde841ba02bceb70845f04fd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,36 @@
-/nbproject/private/
-/nbproject/*~
-/manifest.mf
-/build/
-/dist/
-/data/*
-/*.properties
-/*-ejb/nbproject/private/
-/*-ejb/nbproject/*~
-/*-ejb/build/
-/*-ejb/dist/
+avatar/*
+files/*
+file/*
+local/*
+_darcs/*
+logs/*
+log/*
+run/*
+config.php
+.htaccess
+httpd.conf
+*.tmproj
+dataobject.ini
+*~
+*.bak
+*.orig
+*.rej
+.#*
+*.swp
+.buildpath
+.project
+.settings
+TODO.rym
+config-*.php
+good-config.php
+lac08.log
+php.log
+.DS_Store
+nbproject
+*.mo
+*log*
+htaccess-sample
+installer.txt
+extlib/DB.php
+.gitmodules
+*_plugin/*