diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 16:29:51 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 16:29:51 +0200 |
| commit | 23ad0936a856dfb67523924e8f036f3289acd218 (patch) | |
| tree | b90596ca4ad6697391485ef4266d3c42ad582c6c /.gitignore | |
| parent | c1ba94c8fdc2ab226de51ae658f330aad853d998 (diff) | |
| parent | 0b7b6529b9f12bfae697aff92fce88b514a9354e (diff) | |
Merge branch '_multilang' into allinone-multilang
Conflicts (manually resolved):
.gitignore
ikiwiki.setup
ikiwiki_da.setup
ikiwiki_nb.setup
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -7,6 +7,8 @@ /content_dummy /content_dummy_da /content_dummy_nb +/directives +/directives_l10n /smiley /smiley_l10n /templates |