summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-06-10 04:46:20 +0000
committerEvan Prodromou <evan@controlyourself.ca>2009-06-10 04:46:20 +0000
commit4110838cb44c9e2e54f8ff8d722fdcbc5666fafe (patch)
tree51335c05e93194217c90a46b21e5477bba47c378 /.gitignore
parent003c63e587128c6d095386c563c2615c2ac245c2 (diff)
parent207750e75774c823328889cb4102aad6a0b12281 (diff)
Merge branch '0.8.x' of git://gitorious.org/laconica/dev into dev/0.8.x
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore6
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index da6947bfd..3418d8ee5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
avatar/*
files/*
+file/*
_darcs/*
logs/*
config.php
@@ -16,3 +17,8 @@ dataobject.ini
.buildpath
.project
.settings
+TODO.rym
+config-*.php
+good-config.php
+lac08.log
+php.log