diff options
author | Jonas Smedegaard <dr@jones.dk> | 2010-07-14 18:59:32 +0200 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-14 18:59:32 +0200 |
commit | bbc758d049591cc0844cef19a5b6dd734e79aaec (patch) | |
tree | 56172412cb9d1b67325a7167921d19a5b1f78674 | |
parent | 4d73ccaec4a3064f6e16a442b18bc5b29ded7fe7 (diff) | |
parent | 03e2dcdf0c094a11950d4efeb6c4e6410ccf9687 (diff) |
Merge branch '_scs' into scs
-rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -1,6 +1,5 @@ /basewiki_l10n /basewiki_nonedit_l10n -/content /content_dummy /directives_l10n /smiley_l10n |