diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 14:51:12 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 14:51:12 +0200 |
| commit | 3266b8164ded4951abc4ec8b444417b3f7dda7f3 (patch) | |
| tree | fffce0e3b7e05a12589291ef593bc8bf56d7c9fd /.gitignore | |
| parent | 5632494fe651111306b2decd0fe6e2278e3d0212 (diff) | |
| parent | ba197084b657f202d1e81424b8fdf71e191f6749 (diff) | |
Merge branch 'master' into allinone
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 |