diff options
| author |   Clément Bénier <clement.benier@iot.bzh> | 2019-03-29 16:56:08 +0100 |
|---|---|---|
| committer | Clément Bénier <clement.benier@iot.bzh> | 2019-03-29 17:04:38 +0100 |
| commit | a734c2f254fe669c20a8fc62a8c4497a5edf708a (patch) | |
| tree | a5fb597c483c9fc4242f339382921396c0cca437 /conf | |
| parent | ddb7b9f1ac7e5b74d4f11f4149456b627b6af439 (diff) | |
| parent | 657afcf4e2bb93255d722b8019a2a352ffc534d1 (diff) | |
Merge remote-tracking branch 'origin/master-next'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/AppDefaults.js | 1 | ||||
| -rw-r--r-- | conf/_config.yml | 2 | ||||
| -rw-r--r-- | conf/_dev.yml | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/conf/AppDefaults.js b/conf/AppDefaults.js index 6a9e213..03f0896 100644 --- a/conf/AppDefaults.js +++ b/conf/AppDefaults.js @@ -38,6 +38,7 @@ config = { // alternate url using cgit GERRIT_FETCH: "https://git.automotivelinux.org/%repo%/plain/%source%?h=%commit%", AGL_GERRIT_BRANCH : "master", + AGL_GITHUB_BRANCH : "master-next", LAST: undefined }; diff --git a/conf/_config.yml b/conf/_config.yml index 9fec3d5..b93c6fb 100644 --- a/conf/_config.yml +++ b/conf/_config.yml @@ -22,7 +22,7 @@ excerpt_separator: <!--more--> # the version to which /latest/ points # NOTE: # this value gets overwritten in _version.yml, which is a generated file -latest_docs_version: dev # overloaded by AppDefaults.js +latest_docs_version: master # overloaded by AppDefaults.js # the docs version that is shown by default when clicking on docs links on the site default_linked_docs_version: latest diff --git a/conf/_dev.yml b/conf/_dev.yml index 8bf011a..d281aa7 100644 --- a/conf/_dev.yml +++ b/conf/_dev.yml @@ -1,5 +1,5 @@ baseurl: "" -default_linked_docs_version: dev +default_linked_docs_version: master destination: build-dev exclude: - static/css-src |