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
commitca01a3472b7ce662494d2ae8fc7895390235f922 (patch)
tree69db17a90b058a30acfb41729a3b6adcf76bbdf1
parentd9ea1cd3c99803750586485e06d3bcd8f895f88d (diff)
parentf37da5c6b48a5e7ed61a36dff22b99aaf276e6cf (diff)
Merge branch '_nb' into nb
-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