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
commit9cee42aeaf410be8441ea2c6740435e65ba4bbf4 (patch)
treeeb8c8de288d889ba3378e97a3f532e7ca078f5ec
parentf37da5c6b48a5e7ed61a36dff22b99aaf276e6cf (diff)
parent4ce993d8de48dec0e8afd2ecfb52bf132212c3d4 (diff)
Merge branch 'master' 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