summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-08-20Merge branch '_clean' into allinoneJonas Smedegaard
2008-08-20Merge branch 'master' into allinoneJonas Smedegaard
2008-08-20Merge branch 'master' into _cleanJonas Smedegaard
2008-08-20Fix branch checkout in git.mk.Jonas Smedegaard
2008-08-15Merge branch 'nonedit' into allinoneJonas Smedegaard
2008-08-15Merge branch '_scs' into allinoneJonas Smedegaard
2008-08-15Merge branch '_clean' into allinoneJonas Smedegaard
2008-08-15Merge branch 'master' into allinoneJonas Smedegaard
2008-08-15Merge branch 'master' into _cleanJonas Smedegaard
2008-08-15Merge branch 'master' into noneditJonas Smedegaard
2008-08-15Merge branch 'master' into _scsJonas Smedegaard
2008-08-15Avoid Git force-updating (loose commits not pushed).Jonas Smedegaard
2008-08-15Merge branch 'nonedit' into allinoneJonas Smedegaard
2008-08-15List admin setup before regular in Makefile (to minimize risk of public ↵Jonas Smedegaard
visible breakage).
2008-08-11Merge branch 'nonedit' into allinoneJonas Smedegaard
2008-08-11Fix (again) use admin.example.org as host for admin site.Jonas Smedegaard
2008-08-11Merge branch 'nonedit' into allinoneJonas Smedegaard
2008-08-11Fix (again) use admin.example.org as destdir for admin site.Jonas Smedegaard
2008-08-11Clean admin setup.Jonas Smedegaard
2008-08-11Merge branch 'nonedit' into allinoneJonas Smedegaard
2008-08-11Merge branch '_scs' into allinoneJonas Smedegaard
2008-08-11Merge branch '_clean' into allinoneJonas Smedegaard
2008-08-11Merge branch 'master' into allinoneJonas Smedegaard
Conflicts (manually resolved): ikiwiki.setup
2008-08-11Merge branch 'master' into noneditJonas Smedegaard
Conflicts (manually resolved): ikiwiki.setup
2008-08-11Merge branch 'master' into _cleanJonas Smedegaard
2008-08-11Merge branch 'master' into _scsJonas Smedegaard
2008-08-11Fix shorten destdir to match url.Jonas Smedegaard
2008-08-11Merge branch 'nonedit' into allinoneJonas Smedegaard
2008-08-11Merge branch '_scs' into allinoneJonas Smedegaard
2008-08-11Merge branch '_clean' into allinoneJonas Smedegaard
2008-08-11Merge branch 'master' into allinoneJonas Smedegaard
Conflicts (manually resolved): ikiwiki.setup Also, examplewiki -> samplewiki applied to admin setup too.
2008-08-11Merge branch 'master' into noneditJonas Smedegaard
Conflicts (manually resolved): ikiwiki.setup Also, examplewiki -> samplewiki applied to admin setup too.
2008-08-11Merge branch 'master' into _cleanJonas Smedegaard
2008-08-11Merge branch 'master' into _scsJonas Smedegaard
2008-08-11Fix inconsistency examplewiki -> samplewiki.Jonas Smedegaard
2008-08-11Merge branch 'nonedit' into allinoneJonas Smedegaard
2008-08-11Fix add trailing -admin to git wrapper path.Jonas Smedegaard
2008-08-11Fix shorten destdir to match url.Jonas Smedegaard
2008-08-10Merge branch 'scs' into allinoneJonas Smedegaard
2008-08-10Merge branch 'clean' into allinoneJonas Smedegaard
2008-08-10Merge branch 'nonedit' into allinoneJonas Smedegaard
2008-08-10Change (again) to scs branch.Jonas Smedegaard
2008-08-10Revert to master branch (to ease merging).Jonas Smedegaard
2008-08-10Change (again) to clean branch.Jonas Smedegaard
2008-08-10Revert to master branch (to ease merging).Jonas Smedegaard
2008-08-10Merge branch 'wian' into allinoneJonas Smedegaard
2008-08-10Merge branch 'scs' into allinoneJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-10Merge branch 'clean' into allinoneJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-10Merge branch 'master' into allinoneJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-10Merge branch 'master' into noneditJonas Smedegaard
Conflicts (manually resolved): Makefile
generated by cgit v1.2.3 (git 2.46.0) at 2024-12-02 04:59:05 +0000