diff options
| author | Yorhel <git@yorhel.nl> | 2010-11-28 10:45:43 +0100 |
|---|---|---|
| committer | Yorhel <git@yorhel.nl> | 2010-11-28 10:45:43 +0100 |
| commit | e27071f4110c6a93ef140b2d3dde331194917616 (patch) | |
| tree | 269a8479ebe7a1b56480fae45b97ff5f30b728ad /.gitignore | |
| parent | afa8f6cb619fd59d164d15d12249560706878639 (diff) | |
| parent | 5bfd8f4559f2ce54332d28ac767619c020b151dc (diff) | |
Merge branch 'beta'
Conflicts:
lib/VNDB/Handler/Discussions.pm
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -2,7 +2,8 @@ /data/multi.pid /data/docs/8 /data/log/ -/static/f/script.js +/static/f/js/ +/static/feeds/ /static/s/*/style.css /static/s/*/boxbg.png /static/cv/ |