| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2010-07-19 | Merge branch 'master' into allinone-da | Jonas Smedegaard | |
| Conflicts (changes suppressed): basewiki templates | |||
| 2010-07-19 | Merge branch 'master' into _nb | Jonas Smedegaard | |
| Conflicts (override with HEAD of submodules): basewiki templates | |||
| 2010-07-19 | Merge branch 'master' into _da | Jonas Smedegaard | |
| Conflicts (override with HEAD of submodules): basewiki templates | |||
| 2010-07-19 | Merge branch 'master' into wian | Jonas Smedegaard | |
| Conflicts: basewiki templates | |||
| 2010-07-19 | Merge branch 'master' into noneditnonedit | Jonas Smedegaard | |
| 2010-07-19 | Merge branch 'master' into _scs | Jonas Smedegaard | |
| Conflicts (suppressed): basewiki templates | |||
| 2010-07-19 | Merge branch 'master' into _clean | Jonas Smedegaard | |
| Conflicts (suppressed): basewiki | |||
| 2010-07-19 | Sync submodules basewiki directives and templates. | Jonas Smedegaard | |
| 2010-07-19 | Merge branch 'allinone-nb' into allinone-multilang | Jonas Smedegaard | |
| Conflicts (suppress new changes): basewiki_nonedit templates_nonedit | |||
| 2010-07-19 | Merge branch 'allinone-da' into allinone-multilang | Jonas Smedegaard | |
| Conflicts (sync submodule basewiki with HEAD of allinone, and submodules javascript and openid-selector with HEAD of master): basewiki | |||
| 2010-07-19 | Merge branch '_multilang' into allinone-multilang | Jonas Smedegaard | |
| Conflicts (sync submodule basewiki with HEAD of allinone): basewiki | |||
| 2010-07-19 | Add localized submodules of javascript and openid-selector. | Jonas Smedegaard | |
| 2010-07-19 | Sync submodule basewiki with HEAD of allinone. | Jonas Smedegaard | |
| 2010-07-19 | Merge branch 'nonedit' into allinone-nb | Jonas Smedegaard | |
| Conflicts (sync submodule basewiki with HEAD of allinone-nb): basewiki | |||
| 2010-07-19 | Merge branch '_scs' into allinone-nb | Jonas Smedegaard | |
| Conflicts (sync submodule basewiki with HEAD of allinone-nb): basewiki | |||
| 2010-07-19 | Merge branch '_clean' into allinone-nb | Jonas Smedegaard | |
| Conflicts (sync submodule basewiki with HEAD of allinone-nb): basewiki | |||
| 2010-07-19 | Merge branch 'nonedit' into allinone-da | Jonas Smedegaard | |
| Conflicts (sync submodule basewiki with HEAD of allinone-da): basewiki | |||
| 2010-07-19 | Merge branch '_scs' into allinone-da | Jonas Smedegaard | |
| Conflicts (sync submodule basewiki with HEAD of allinone-da): basewiki | |||
| 2010-07-19 | Merge branch '_clean' into allinone-da | Jonas Smedegaard | |
| Conflicts (sync submodule basewiki with HEAD of allinone-da): basewiki | |||
| 2010-07-19 | Merge branch '_nb' into allinone-nb | Jonas Smedegaard | |
| Conflicts (sync submodules basewiki, basewiki_nonedit and templates_nonedit with HEAD of *_nb branch): basewiki | |||
| 2010-07-19 | Merge branch '_da' into allinone-da | Jonas Smedegaard | |
| Conflicts (use HEAD of submodule allinone-da): basewiki | |||
| 2010-07-19 | Sync with HEAD of submodule basewiki. | Jonas Smedegaard | |
| 2010-07-19 | Sync with HEAD of submodule basewiki. | Jonas Smedegaard | |
| 2010-07-19 | Sync with HEAD of submodule basewiki. | Jonas Smedegaard | |
| 2010-07-19 | Sync with HEAD of submodule basewiki. | Jonas Smedegaard | |
| 2010-07-19 | Merge branch '_nb' into nb | Jonas Smedegaard | |
| 2010-07-19 | Merge branch '_da' into da | Jonas Smedegaard | |
| 2010-07-19 | Sync with HEAD of submodules basewiki, javascript and openid-selector. | Jonas Smedegaard | |
| 2010-07-19 | Sync with HEAD of submodules basewiki, javascript and openid-selector. | Jonas Smedegaard | |
| 2010-07-19 | Merge branch 'allinone-nb' into allinone-multilang | Jonas Smedegaard | |
| 2010-07-19 | Merge branch 'allinone-da' into allinone-multilang | Jonas Smedegaard | |
| Conflicts (manually resolved: merge old and new parts): .gitmodules | |||
| 2010-07-19 | Merge branch '_multilang' into allinone-multilang | Jonas Smedegaard | |
| Conflicts (manually resolved: merge old and new parts): .gitmodules | |||
| 2010-07-19 | Merge branch 'wian' into allinone-nb | Jonas Smedegaard | |
| 2010-07-19 | Merge branch 'wian' into allinone-da | Jonas Smedegaard | |
| 2010-07-19 | Merge branch 'nonedit' into allinone-nb | Jonas Smedegaard | |
| 2010-07-19 | Merge branch 'nonedit' into allinone-da | Jonas Smedegaard | |
| 2010-07-19 | Merge branch '_scs' into allinone-nb | Jonas Smedegaard | |
| 2010-07-19 | Merge branch '_scs' into allinone-da | Jonas Smedegaard | |
| 2010-07-19 | Merge branch '_clean' into allinone-nb | Jonas Smedegaard | |
| 2010-07-19 | Merge branch '_nb' into nb | Jonas Smedegaard | |
| 2010-07-19 | Merge branch '_da' into da | Jonas Smedegaard | |
| 2010-07-19 | Merge branch '_clean' into allinone-da | Jonas Smedegaard | |
| 2010-07-19 | Merge branch '_nb' into allinone-nb | Jonas Smedegaard | |
| 2010-07-19 | Merge branch '_da' into allinone-da | Jonas Smedegaard | |
| 2010-07-19 | Merge branch 'master' into _multilang | Jonas Smedegaard | |
| Conflicts (manually resolved: merge old and new parts): .gitmodules | |||
| 2010-07-19 | Merge branch 'master' into allinone-nb | Jonas Smedegaard | |
| Conflicts (manually resolved: merge old and new parts): .gitmodules | |||
| 2010-07-19 | Merge branch 'master' into allinone-da | Jonas Smedegaard | |
| Conflicts (manually resolved: merge old and new parts): .gitmodules | |||
| 2010-07-19 | Merge branch 'master' into wian | Jonas Smedegaard | |
| 2010-07-19 | Merge branch 'master' into _nb | Jonas Smedegaard | |
| 2010-07-19 | Merge branch 'master' into _da | Jonas Smedegaard | |
 |
index : ikiwiki/legacy | |
| old ikiwiki engine, based on git.ikiwiki.info | Jonas Smedegaard |
| summaryrefslogtreecommitdiff |