diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 14:37:58 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 14:37:58 +0200 |
| commit | 7b29486aff134aa1da48c94bfcffb97775b8376b (patch) | |
| tree | 4358036c369dc22aa8bf823cd16b1b22c1d5809e /.gitignore | |
| parent | 01a3740f9655cdc25748a12b394d6de5e88c8e01 (diff) | |
| parent | 2bf0496332132cb456930e2e37395a91268e23ba (diff) | |
Merge branch 'master' into nonedit
Conflicts (manually resolved):
ikiwiki.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 |