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
commitbbc758d049591cc0844cef19a5b6dd734e79aaec (patch)
tree56172412cb9d1b67325a7167921d19a5b1f78674
parent4d73ccaec4a3064f6e16a442b18bc5b29ded7fe7 (diff)
parent03e2dcdf0c094a11950d4efeb6c4e6410ccf9687 (diff)
Merge branch '_scs' into scs
-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