summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-10-23 14:18:03 +0200
committerJonas Smedegaard <dr@jones.dk>2008-10-23 14:18:03 +0200
commit344e4f57dec515fa62b6cdf04399a0a08ae198ae (patch)
tree82c2b9de5ead60a025351d1ce19105ee4fcd8cc5 /.gitignore
parent060a04f45e48ec3963beec69e8168ca41d6d324d (diff)
parent2bf0496332132cb456930e2e37395a91268e23ba (diff)
Merge branch 'master' into _clean
Conflicts (manually resolved): ikiwiki.setup
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index df30d2f..8749894 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,8 @@
/basewiki_nonedit_l10n
/content
/content_dummy
+/directives
+/directives_l10n
/smiley
/smiley_l10n
/templates