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 | 1094ffeef1000546431edff20db99a27667f2dea (patch) | |
tree | 0e1ea0014c41c56e7ac11169c179b20c76a9e7cc | |
parent | 7fdaa2d924d939f4c45523447f8cde76c6d769dd (diff) | |
parent | 4ce993d8de48dec0e8afd2ecfb52bf132212c3d4 (diff) |
Merge branch 'master' into allinone
-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 |