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
commit92b300411942e76fd997619596051caf0a6ee6bc (patch)
tree7b9624f2aeeb1d5d8c9767baf5c51a991953cd82
parent29e876158a9e476d02fb99d76fabfdbebcfde92a (diff)
parent4ce993d8de48dec0e8afd2ecfb52bf132212c3d4 (diff)
Merge branch 'master' into _clean
-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