summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-07-14 14:28:01 +0200
committerJonas Smedegaard <dr@jones.dk>2010-07-14 14:28:01 +0200
commitcceedc3ff37025a679d6be0e36e3ef682b01a9c4 (patch)
treebd2d23c6f9039fff26ab5c5f8c8239726febbdf4
parent8b2cd37b26259b35a998b7a7f91a1c9fffa37fa7 (diff)
parentd6a5af71707465ddb6e312950088b917ff1765a6 (diff)
Merge branch 'master' into _multilang
-rw-r--r--.gitignore2
1 files changed, 0 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 1cd49d1..1f46f44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,8 @@
/basewiki_l10n
-/basewiki_nonedit
/basewiki_nonedit_l10n
/content
/content_dummy
/directives_l10n
/smiley_l10n
/templates_l10n
-/templates_nonedit
/templates_nonedit_l10n