Merge remote-tracking branch 'upstream/master' into social-master
[quix0rs-gnu-social.git] / .gitignore
1 avatar/*
2 files/*
3 file/*
4 local/*
5 _darcs/*
6 logs/*
7 log/*
8 run/*
9 config.php
10 .htaccess
11 httpd.conf
12 *.tmproj
13 dataobject.ini
14 *~
15 *.bak
16 *.orig
17 *.rej
18 .#*
19 *.swp
20 .buildpath
21 .project
22 .settings
23 TODO.rym
24 config-*.php
25 good-config.php
26 lac08.log
27 php.log
28 .DS_Store
29 nbproject
30 *.mo
31 *log*
32 htaccess-sample
33 installer.txt
34 extlib/DB.php
35 .gitmodules
36 *_plugin/*