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 | 03e2dcdf0c094a11950d4efeb6c4e6410ccf9687 (patch) | |
| tree | 56172412cb9d1b67325a7167921d19a5b1f78674 | |
| parent | 88911b351914abacc8dac49592867e39616fe84e (diff) | |
| parent | 4ce993d8de48dec0e8afd2ecfb52bf132212c3d4 (diff) | |
Merge branch 'master' 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 |