diff options
| author | Jeffery To <jeffery.to@gmail.com> | 2009-06-24 01:25:55 +0800 |
|---|---|---|
| committer | Jeffery To <jeffery.to@gmail.com> | 2009-06-24 01:25:55 +0800 |
| commit | 280f8faab4f692ff7f4389f82397adfa6db56325 (patch) | |
| tree | 94a076bfb3d13c7e6699e0149ee75fff6801880c /.gitignore | |
| parent | bb3361467c002e38aa3a424672f332b32a647e17 (diff) | |
| parent | eb40fbc17ad1efb0a4c51ee00b1e9408d2af382f (diff) | |
Merge branch '0.8.x' into small-fixes
Conflicts:
lib/peoplesearchresults.php
lib/profilelist.php
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 3418d8ee5..f4c2bba5f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ avatar/* +background/* files/* file/* _darcs/* @@ -22,3 +23,4 @@ config-*.php good-config.php lac08.log php.log +config.php.* |