Skip to content

E
edx-platform
Commit bb3cf56f by Valera Rozuvan
Options

Fixed up CHANGELOG.

parent 3086f16d
Showing with 3 additions and 4 deletions
CHANGELOG.rst
...@@ -13,12 +13,11 @@ instance, Boolean, Integer, String), but also allow them to hold either the ...@@ -13,12 +13,11 @@ instance, Boolean, Integer, String), but also allow them to hold either the
typed value, or a String that can be converted to their typed value. For example, typed value, or a String that can be converted to their typed value. For example,
an Integer can contain 3 or '3'. This changed an update to the xblock library. an Integer can contain 3 or '3'. This changed an update to the xblock library.
<<<<<<< HEAD
LMS: Courses whose id matches a regex in the COURSES_WITH_UNSAFE_CODE Django LMS: Courses whose id matches a regex in the COURSES_WITH_UNSAFE_CODE Django
setting now run entirely outside the Python sandbox. setting now run entirely outside the Python sandbox.
=======
Blades: Added tests for Video Alpha player. Blades: Added tests for Video Alpha player. Added comment about enabling some
>>>>>>> 812be7a... Added comment about enabling some Video Alpha tests when testing locally. Updated CHANGELOG. Video Alpha tests when testing locally. Updated CHANGELOG.
Blades: Video Alpha bug fix for speed changing to 1.0 in Firefox. Blades: Video Alpha bug fix for speed changing to 1.0 in Firefox.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment