summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-07-14 18:59:32 +0200
committerJonas Smedegaard <dr@jones.dk>2010-07-14 18:59:32 +0200
commit58c0420d25da3f494d00e927604dcf29b6eca4a5 (patch)
tree9d5c9a7646f354f03efd4c93211166a154032ac6
parentca01a3472b7ce662494d2ae8fc7895390235f922 (diff)
parent9cee42aeaf410be8441ea2c6740435e65ba4bbf4 (diff)
Merge branch '_nb' into nb
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 1f46f44..0ff330c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
/basewiki_l10n
/basewiki_nonedit_l10n
-/content
/content_dummy
/directives_l10n
/smiley_l10n