release-ulmo
feat: add thumbnail field to video xblock fields
fix: replace 'ugettext' with 'gettext' in cms
refactor!: switch from LegacyWaffle* to modern waffles (#30330)
Revert "Merge ulmo.1 into release-ulmo"
fix: replace ugettext with gettext (#33022)
Add h filter page directive to cms mako templates without variables The files to change were found with: `ack --literal --type=html --match '${' --files-without-matches cms/templates`
removed extra section heading in settings DOM, placed settings after editor
AA-513: Reset segment state if anon user and there is a segment user id
Secure templates used to inject Segment and Optimizely
docs: Update refs to docs.edx.org
chore: remove some usages of six (Python2 compat) (#32554)