MDL-36421 SCORM: fix SCORM course format new window popups
MDL-34612 Grade condition range validation allows impossible conditions
Merge branch 'MDL-37395-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE
Merge branch 'MDL-34883_unit_tests_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE
MDL-33117 Whitespace fixes
NOBUG: 1 more whitespace, was hurting my eyes all the time.
Merge branch 'wip-mdl-37062-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE
Merge branch 'MDL-31616_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Revert "MDL-33117 Whitespace fixes"

This reverts commit 5696c69b3b3e18d1198cc6c0fb5683134d16e374.
Revert "MDL-33117 grade: adding unit tests for the user report function inject_rowspans()"

This reverts commit b65bd8b65825e1a0ef4e6dcc5280381433930495.
Merge branch 'MDL-37354-stable23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE
Merge branch 'MDL-37173-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE
Merge branch 'wip-MDL-35818-stable23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE
Automatically generated installer lang files
Merge branch 'MDL-37313_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
MDL-37313 question: fix trailing whitespace
MDL-37339 Administration: Unique custom profile should not be checked if it's empty.

Currently we have two options for custom profile fields 'Unique' and 'Required'
If value s not entered for unique and not required field then we should allow
duplicate empty values. If value is entered then we should check for unique input.
In case field is unique and required then it should be always checked as required
field can't be empty.
Merge branch 'MDL-36412-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE
MDL-31484 backup - repeated restores with anonymised users now works correctly
MDL-37527 Assignment - Change query for print_overview so it uses an index (postgres)

Reported by Mark Neilsen.

Conflicts:

	mod/assign/lib.php