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 | 00d14a048bfbcc85c905ab2c22b122e63c1de8d3 (patch) | |
tree | 976f1906f8f5fd81d2500acc1964874c02eea951 | |
parent | cceedc3ff37025a679d6be0e36e3ef682b01a9c4 (diff) | |
parent | 4ce993d8de48dec0e8afd2ecfb52bf132212c3d4 (diff) |
Merge branch 'master' into _multilang
-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 |