6
0
mirror of https://github.com/ChristianLight/tutor.git synced 2024-09-28 20:29:02 +00:00

Merge branch 'master' into nightly

This commit is contained in:
Régis Behmo 2023-05-23 08:16:43 +02:00
commit 35743eb905
3 changed files with 7 additions and 2 deletions

View File

@ -20,6 +20,11 @@ instructions, because git commits are used to generate release notes:
<!-- scriv-insert-here -->
<a id='changelog-15.3.6'></a>
## v15.3.6 (2023-05-22)
- [Feature] Upgrade to open-release/olive.4. (by @regisb)
<a id='changelog-15.3.5'></a>
## v15.3.5 (2023-04-28)

View File

@ -130,7 +130,7 @@ Open edX customisation
This defines the git repository from which you install Open edX platform code. If you run an Open edX fork with custom patches, set this to your own git repository. You may also override this configuration parameter at build time, by providing a ``--build-arg`` option.
- ``OPENEDX_COMMON_VERSION`` (default: ``"open-release/olive.3"``)
- ``OPENEDX_COMMON_VERSION`` (default: ``"open-release/olive.4"``)
This defines the default version that will be pulled from all Open edX git repositories.

View File

@ -2,7 +2,7 @@ import os
# Increment this version number to trigger a new release. See
# docs/tutor.html#versioning for information on the versioning scheme.
__version__ = "15.3.5"
__version__ = "15.3.6"
# The version suffix will be appended to the actual version, separated by a
# dash. Use this suffix to differentiate between the actual released version and