summaryrefslogtreecommitdiff
path: root/ikiwiki.setup
AgeCommit message (Collapse)Author
2008-08-11Merge branch 'master' into allinoneJonas Smedegaard
Conflicts (manually resolved): ikiwiki.setup
2008-08-11Fix shorten destdir to match url.Jonas Smedegaard
2008-08-11Merge branch 'master' into allinoneJonas Smedegaard
Conflicts (manually resolved): ikiwiki.setup Also, examplewiki -> samplewiki applied to admin setup too.
2008-08-11Fix inconsistency examplewiki -> samplewiki.Jonas Smedegaard
2008-08-10Merge branch 'nonedit' into allinoneJonas Smedegaard
2008-08-10Merge branch 'master' into allinoneJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-10Use nonedit branch and dummy content for main setup.Jonas Smedegaard
2008-08-10Adapt ikiwiki.setup paths to common usage.Jonas Smedegaard
2008-08-01Merge branch 'master' into cleanJonas Smedegaard
(newly added monotone hook stripped too)
2008-08-01Sync ikiwiki.setup with ikiwiki 2.55.Jonas Smedegaard
2008-07-13Drop non-Git VCS options from config. Use clean content branches.Jonas Smedegaard
2008-02-22Sync ikiwiki.setup with ikiwiki 2.32.3.Jonas Smedegaard
2007-10-21Grab upstream pages from version 2.10.Jonas Smedegaard