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
commit8e548e2309062e7926bac37ed689594f92f7dd5d (patch)
treedc1b12b158ea40f2ad89eb389067cf2a603ab37c
parent27eac715e449c4bb6e5b17cc9bf957942e518940 (diff)
parent4ce993d8de48dec0e8afd2ecfb52bf132212c3d4 (diff)
Merge branch 'master' into allinone-da
-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