diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-14 18:12:14 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-14 18:12:14 +0200 |
| commit | 2b7136af76f5020af7a09342037ef4858472d58f (patch) | |
| tree | d034487d2f300659752b17977435525b84519a3b /.gitmodules | |
| parent | 389bf6975303628a6be6d2ca04881ed2b41e09b6 (diff) | |
| parent | 936aa727e91b8be20111c7ac553c259247daa7cf (diff) | |
Merge branch 'allinone-nb' into allinone-multilang
Conflicts (manually resolved):
basewiki
ikiwiki_nb.setup
ikiwiki_nb_admin.setup
smiley
templates
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions