diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 14:44:00 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 14:47:07 +0200 |
| commit | b4b490324165d7177199034316ef3bc76be362dd (patch) | |
| tree | 2684d494cff7e9332d2d8025d70b7a345139a22a /.gitignore | |
| parent | c67700c46dd282879dcccf1db2eb77ad22055401 (diff) | |
| parent | ba197084b657f202d1e81424b8fdf71e191f6749 (diff) | |
Merge branch 'master' into _da
Conflicts (manually resolved):
ikiwiki_da.setup
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -4,6 +4,8 @@ /basewiki_nonedit_l10n /content /content_dummy +/directives +/directives_l10n /smiley /smiley_l10n /templates |