summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-07-19Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
2010-07-19Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
Conflicts (suppress changes): basewiki_nonedit
2010-07-19Merge branch '_multilang' into allinone-multilangJonas Smedegaard
Conflicts (sync with submodule HEADs): templates
2010-07-19Merge branch 'wian' into allinone-nbJonas Smedegaard
Conflicts (suppress changes): basewiki
2010-07-19Merge branch 'nonedit' into allinone-nbJonas Smedegaard
2010-07-19Merge branch '_scs' into allinone-nbJonas Smedegaard
Conflicts (suppress changes): basewiki templates
2010-07-19Merge branch '_clean' into allinone-nbJonas Smedegaard
Conflicts (suppress changes): basewiki
2010-07-19Merge branch 'wian' into allinone-daJonas Smedegaard
Conflicts (suppress changes): basewiki
2010-07-19Merge branch 'nonedit' into allinone-daJonas Smedegaard
2010-07-19Merge branch '_scs' into allinone-daJonas Smedegaard
Conflicts (suppress changes): basewiki templates
2010-07-19Merge branch '_clean' into allinone-daJonas Smedegaard
Conflicts (suppress changes): basewiki
2010-07-19Merge branch '_nb' into allinone-nbJonas Smedegaard
Conflicts (changes suppressed): basewiki smiley templates
2010-07-19Merge branch '_da' into allinone-daJonas Smedegaard
Conflicts (sync submodules with HEAD of allinone-da): basewiki smiley templates
2010-07-19Fix revert submodules basewiki and templates to sync with HEAD of master ↵Jonas Smedegaard
(not scs: switch later).
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-19Fix revert submodules basewiki and templates to sync with HEAD of master ↵Jonas Smedegaard
(not clean switch later).
2010-07-19Merge branch 'master' into _multilangJonas Smedegaard
2010-07-19Merge branch 'master' into allinone-nbJonas Smedegaard
Conflicts (changes suppressed): basewiki templates
2010-07-19Merge branch 'master' into allinone-daJonas Smedegaard
Conflicts (changes suppressed): basewiki templates
2010-07-19Merge branch 'master' into _nbJonas Smedegaard
Conflicts (override with HEAD of submodules): basewiki templates
2010-07-19Merge branch 'master' into _daJonas Smedegaard
Conflicts (override with HEAD of submodules): basewiki templates
2010-07-19Merge branch 'master' into wianJonas Smedegaard
Conflicts: basewiki templates
2010-07-19Merge branch 'master' into noneditnoneditJonas Smedegaard
2010-07-19Merge branch 'master' into _scsJonas Smedegaard
Conflicts (suppressed): basewiki templates
2010-07-19Merge branch 'master' into _cleanJonas Smedegaard
Conflicts (suppressed): basewiki
2010-07-19Sync submodules basewiki directives and templates.Jonas Smedegaard
2010-07-19Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
Conflicts (suppress new changes): basewiki_nonedit templates_nonedit
2010-07-19Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
Conflicts (sync submodule basewiki with HEAD of allinone, and submodules javascript and openid-selector with HEAD of master): basewiki
2010-07-19Merge branch '_multilang' into allinone-multilangJonas Smedegaard
Conflicts (sync submodule basewiki with HEAD of allinone): basewiki
2010-07-19Add localized submodules of javascript and openid-selector.Jonas Smedegaard
2010-07-19Sync submodule basewiki with HEAD of allinone.Jonas Smedegaard
2010-07-19Merge branch 'nonedit' into allinone-nbJonas Smedegaard
Conflicts (sync submodule basewiki with HEAD of allinone-nb): basewiki
2010-07-19Merge branch '_scs' into allinone-nbJonas Smedegaard
Conflicts (sync submodule basewiki with HEAD of allinone-nb): basewiki
2010-07-19Merge branch '_clean' into allinone-nbJonas Smedegaard
Conflicts (sync submodule basewiki with HEAD of allinone-nb): basewiki
2010-07-19Merge branch 'nonedit' into allinone-daJonas Smedegaard
Conflicts (sync submodule basewiki with HEAD of allinone-da): basewiki
2010-07-19Merge branch '_scs' into allinone-daJonas Smedegaard
Conflicts (sync submodule basewiki with HEAD of allinone-da): basewiki
2010-07-19Merge branch '_clean' into allinone-daJonas Smedegaard
Conflicts (sync submodule basewiki with HEAD of allinone-da): basewiki
2010-07-19Merge branch '_nb' into allinone-nbJonas Smedegaard
Conflicts (sync submodules basewiki, basewiki_nonedit and templates_nonedit with HEAD of *_nb branch): basewiki
2010-07-19Merge branch '_da' into allinone-daJonas Smedegaard
Conflicts (use HEAD of submodule allinone-da): basewiki
2010-07-19Sync with HEAD of submodule basewiki.Jonas Smedegaard
2010-07-19Sync with HEAD of submodule basewiki.Jonas Smedegaard
2010-07-19Sync with HEAD of submodule basewiki.Jonas Smedegaard
2010-07-19Sync with HEAD of submodule basewiki.Jonas Smedegaard
2010-07-19Sync with HEAD of submodules basewiki, javascript and openid-selector.Jonas Smedegaard
2010-07-19Sync with HEAD of submodules basewiki, javascript and openid-selector.Jonas Smedegaard
2010-07-19Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
2010-07-19Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved: merge old and new parts): .gitmodules
2010-07-19Merge branch '_multilang' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved: merge old and new parts): .gitmodules
2010-07-19Merge branch 'wian' into allinone-nbJonas Smedegaard