diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-08-31 17:01:30 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-31 17:01:30 +0200 |
| commit | 7d1456c585488d31dab8429ac6ffa959441c83fb (patch) | |
| tree | 15d4b264052d56c26c523ab9470488585e252fa5 /.gitignore | |
| parent | f96b7a3d174bdb8429781a2e5e9ddc2137d9414e (diff) | |
| parent | 3859a1938ba5d0f0eb30c2a15d3b6b628c667ef9 (diff) | |
Merge branch '_multilang' into allinone-multilang
Conflicts (manually resolved):
ikiwiki_da.setup
ikiwiki_nb.setup
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions