diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 14:46:24 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 14:46:24 +0200 |
| commit | 678bc6f97405e150a3a575bd0cfc42fbb618c365 (patch) | |
| tree | 57a1bb232fa00a966d9f283128ce3b08c1efa226 /.gitignore | |
| parent | b4fa3588d8e9fe4ab98c500f3e5a4469e0613026 (diff) | |
| parent | ba197084b657f202d1e81424b8fdf71e191f6749 (diff) | |
Merge branch 'master' into _nb
Conflicts (manually resolved):
ikiwiki_nb.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 |