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
commit58f55b70bb3f739ebb9e82a5b3b3b31bff36f079 (patch)
treea87ed49827acc6f20582ace1099baa7334dcb398
parentf3b42781c23109f2fbe055ec4c3c896952d4b207 (diff)
parent4ce993d8de48dec0e8afd2ecfb52bf132212c3d4 (diff)
Merge branch 'master' into wian
-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