Skip to content

Commit

Permalink
Merge branch 'master' into automatic_rudolph
Browse files Browse the repository at this point in the history
  • Loading branch information
faucomte97 authored Nov 28, 2023
2 parents 0776a97 + e412665 commit a370b07
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

<!--next-version-placeholder-->

## v5.15.13 (2023-11-28)

### Fix

* Bring back editor var ([#1542](https://github.com/ocadotechnology/rapid-router/issues/1542)) ([`d7cb10e`](https://github.com/ocadotechnology/rapid-router/commit/d7cb10eb0a5d2aad03f3999e6a9635177ed4b0b8))

## v5.15.12 (2023-11-28)

### Fix
Expand Down
2 changes: 1 addition & 1 deletion game/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "5.15.12"
__version__ = "5.15.13"
1 change: 1 addition & 0 deletions game/static/game/js/level_editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -2727,6 +2727,7 @@ ocargo.LevelEditor = function(levelId) {
/******************/

$(function() {
var editor = new ocargo.LevelEditor(LEVEL); // This seems unused but removing it breaks the editor page.
var subtitle = interpolate(
gettext('Click %(help_icon)s%(help_label)s for clues on getting started.'), {
help_icon: ocargo.jsElements.image(ocargo.Drawing.imageDir + 'icons/help.svg', 'popupHelp'),
Expand Down

0 comments on commit a370b07

Please sign in to comment.