summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-07-14 14:28:00 +0200
committerJonas Smedegaard <dr@jones.dk>2010-07-14 14:28:00 +0200
commit29e876158a9e476d02fb99d76fabfdbebcfde92a (patch)
tree7121983e13096a649be3433c458d95a9e1beadc3
parent82f0f61a46b31cf7ecc2ee20b276525cc56743f8 (diff)
parentd6a5af71707465ddb6e312950088b917ff1765a6 (diff)
Merge branch 'master' into _clean
-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