summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-08-30Merge branch 'master' into _scsJonas Smedegaard
2008-08-30Merge branch 'master' into _cleanJonas Smedegaard
2008-08-30Sync POT and danish PO with ikiwiki 2.62.1.Jonas Smedegaard
2008-08-30Adjust header when creating/updating POT files.Jonas Smedegaard
2008-08-30Merge branch 'nonedit' into allinone-daJonas Smedegaard
Conflicts (manually resolved): ikiwiki_da_admin.setup
2008-08-30Fix use admin.example... (not admin.wiki.example...).Jonas Smedegaard
2008-08-20Merge branch 'nonedit' into allinone-daJonas Smedegaard
2008-08-20Merge branch '_scs' into allinone-daJonas Smedegaard
2008-08-20Merge branch '_clean' into allinone-daJonas Smedegaard
2008-08-20Merge branch '_da' into allinone-daJonas Smedegaard
2008-08-20Merge branch 'master' into _daJonas Smedegaard
2008-08-20Merge branch 'master' into allinone-daJonas Smedegaard
2008-08-20Merge branch 'master' into _scsJonas Smedegaard
2008-08-20Merge branch 'master' into _cleanJonas Smedegaard
2008-08-20Merge branch 'master' into noneditJonas Smedegaard
2008-08-20Fix branch checkout in git.mk.Jonas Smedegaard
2008-08-15Merge branch 'nonedit' into allinone-daJonas Smedegaard
2008-08-15Merge branch '_scs' into allinone-daJonas Smedegaard
2008-08-15Merge branch '_clean' into allinone-daJonas Smedegaard
2008-08-15Merge branch '_da' into allinone-daJonas Smedegaard
2008-08-15Merge branch 'master' into allinone-daJonas Smedegaard
2008-08-15Merge branch 'master' into _daJonas Smedegaard
2008-08-15Merge branch 'master' into _scsJonas Smedegaard
2008-08-15Merge branch 'master' into _cleanJonas Smedegaard
2008-08-15Merge branch 'master' into noneditJonas Smedegaard
2008-08-15Avoid Git force-updating (loose commits not pushed).Jonas Smedegaard
2008-08-15Merge branch 'nonedit' into allinone-daJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-15List admin setup before regular in Makefile (to minimize risk of public ↵Jonas Smedegaard
visible breakage).
2008-08-11Merge branch 'nonedit' into allinone-daJonas Smedegaard
Conflicts (manually resolved): ikiwiki_da_admin.setup
2008-08-11Fix (again) use admin.example.org as host for admin site.Jonas Smedegaard
2008-08-11Merge branch 'nonedit' into allinone-daJonas Smedegaard
2008-08-11Fix (again) use admin.example.org as destdir for admin site.Jonas Smedegaard
2008-08-11Merge branch 'nonedit' into allinone-daJonas Smedegaard
Conflicts (manually resolved): ikiwiki_da.setup
2008-08-11Merge branch '_scs' into allinone-daJonas Smedegaard
2008-08-11Merge branch '_clean' into allinone-daJonas Smedegaard
2008-08-11Merge branch '_da' into allinone-daJonas Smedegaard
2008-08-11Merge branch 'master' into allinone-daJonas Smedegaard
2008-08-11Merge branch 'master' into _daJonas Smedegaard
2008-08-11Merge branch 'master' into noneditJonas Smedegaard
Conflicts (manually resolved): ikiwiki.setup
2008-08-11Merge branch 'master' into _scsJonas Smedegaard
2008-08-11Merge branch 'master' into _cleanJonas Smedegaard
2008-08-11Fix shorten destdir to match url.Jonas Smedegaard
2008-08-11Merge branch 'nonedit' into allinone-daJonas Smedegaard
2008-08-11Merge branch '_scs' into allinone-daJonas Smedegaard
2008-08-11Merge branch '_clean' into allinone-daJonas Smedegaard
2008-08-11Merge branch '_da' into allinone-daJonas Smedegaard
2008-08-11Merge branch 'master' into allinone-daJonas Smedegaard
Conflicts (manually resolved): ikiwiki_da_admin.setup
2008-08-11Merge branch 'master' into _daJonas Smedegaard
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 _scsJonas Smedegaard
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-16 02:50:59 +0000