summaryrefslogtreecommitdiff
path: root/templates
AgeCommit message (Collapse)Author
2010-08-30Merge branch 'nb' into _multilangJonas Smedegaard
Conflicts (manually resolve): Makefile basewiki ikiwiki_nb.setup templates
2010-07-19Sync submodules basewiki, smiley and templates with HEAD of master-nb, and ↵Jonas Smedegaard
javascript and openid-selector with HEAD of master-da.
2010-07-19Sync submodules basewiki, javascript, openid-selector, smiley and templates ↵Jonas Smedegaard
with HEAD of master-da.
2010-07-19Fix revert submodules basewiki, javascript, openid-selector, smiley and ↵Jonas Smedegaard
templates to sync with HEAD of master (not master-nb: switch later).
2010-07-19Fix revert submodules basewiki, javascript, openid-selector, smiley and ↵Jonas Smedegaard
templates to sync with HEAD of master (not master-da: switch later).
2010-07-19Merge branch 'master' into _daJonas Smedegaard
Conflicts (override with HEAD of submodules): basewiki templates
2010-07-19Sync submodules basewiki directives and templates.Jonas Smedegaard
2010-07-11Sync with master_da branch of basewiki, smiley and templates.Jonas Smedegaard
2010-07-11Sync with master-nb branch of basewiki, smiley and templates.Jonas Smedegaard
2010-07-11Add basewiki, directives, smiley and templates as submodules, and no longer ↵Jonas Smedegaard
gitignore them.