diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-04-13 15:48:24 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-04-13 15:48:24 +0200 |
| commit | b50d4c1f4cd2aa88440f5d01465f73aa987210c2 (patch) | |
| tree | 8cd60f696344817ff563c5a9e27094a49a8a381e /.gitignore | |
| parent | 4e8adf29ab24fec68a1e5ac8ccb5553a3ff25133 (diff) | |
| parent | f2ef77fe6c56e979a64f307ff44b9b575b9d12f2 (diff) | |
Merge branch 'master' of debian@coreander:/srv/git/source.jones.dk/ikiwiki
Manually resolved conflicts:
.gitignore
Makefile
ikiwiki.setup
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1,2 +1,8 @@ +/basewiki +/basewiki_l10n +/smiley +/smiley_l10n +/templates +/templates_l10n /content /content_dummy |