diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-11 19:51:30 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-11 19:51:30 +0200 |
| commit | 9ec8b89f51e0b631163c51724e32184b84770e4c (patch) | |
| tree | 511750a194808cb0f39b198ab18029bb7397dc38 /.gitignore | |
| parent | 2b3b3ef6b22755b44e5be6a490fe291c75fbf442 (diff) | |
| parent | c105645368dd025efc83b0dd9e68b7a64bf1f005 (diff) | |
Merge branch '_multilang' into allinone-multilang
Conflicts: (manually resolved)
.gitignore
Makefile
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -1,4 +1,3 @@ -/basewiki /basewiki_l10n /basewiki_nonedit /basewiki_nonedit_l10n @@ -7,11 +6,8 @@ /content_dummy /content_dummy_da /content_dummy_nb -/directives /directives_l10n -/smiley /smiley_l10n -/templates /templates_l10n /templates_nonedit /templates_nonedit_l10n |