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 | 92b300411942e76fd997619596051caf0a6ee6bc (patch) | |
tree | 7b9624f2aeeb1d5d8c9767baf5c51a991953cd82 | |
parent | 29e876158a9e476d02fb99d76fabfdbebcfde92a (diff) | |
parent | 4ce993d8de48dec0e8afd2ecfb52bf132212c3d4 (diff) |
Merge branch 'master' into _clean
-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 |