diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-09 05:16:34 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-09 05:16:34 +0200 |
| commit | cf9d7b60d46c218c2fedc825922b5b1081a40ca3 (patch) | |
| tree | 4d1df1cc98620592c81ba66211878ed68a941930 /.gitignore | |
| parent | a53189cdff1dcb63ba54fe9daec2242963d68ac9 (diff) | |
| parent | e651d76ecad4d55295a1b4805a6113dbae8cda4d (diff) | |
Merge branch 'master' into clean
Conflicts (manually resolved):
Makefile
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1,6 +1,12 @@ /basewiki /basewiki_l10n +/basewiki_nonedit +/basewiki_nonedit_l10n +/content +/content_dummy /smiley /smiley_l10n /templates /templates_l10n +/templates_nonedit +/templates_nonedit_l10n |