summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-10-23 15:35:41 +0200
committerJonas Smedegaard <dr@jones.dk>2008-10-23 15:35:41 +0200
commit0b7b6529b9f12bfae697aff92fce88b514a9354e (patch)
treea25f2880df776cf0fe023d3bb60ac7763b317778 /.gitignore
parent7d6fc0d0edd7c00983dbffab544a301d2d8121e4 (diff)
parentba197084b657f202d1e81424b8fdf71e191f6749 (diff)
Merge branch 'master' into _multilang
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