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 | 9cee42aeaf410be8441ea2c6740435e65ba4bbf4 (patch) | |
| tree | eb8c8de288d889ba3378e97a3f532e7ca078f5ec | |
| parent | f37da5c6b48a5e7ed61a36dff22b99aaf276e6cf (diff) | |
| parent | 4ce993d8de48dec0e8afd2ecfb52bf132212c3d4 (diff) | |
Merge branch 'master' into _nb
| -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 |