diff --git a/ChangeLog.md b/ChangeLog.md index eb470709e..7f1b2fcc0 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,15 @@ +## 2.7.0 + +Features + +- Add info icon with tooltip describing meaning of fmin and fmax in "Partial". @garrettjstevens. [2649](https://github.com/GMOD/Apollo/pull/2649). + +Infrastructure Changes + +- Upgrade Log4j to 2.19.0. Thanks @cmdcolin. [2654](https://github.com/GMOD/Apollo/pull/2654). + - Due to this change, export of instructor reports is no longer available + + ## 2.6.6 Features diff --git a/application.properties b/application.properties index 7ce147056..918718310 100644 --- a/application.properties +++ b/application.properties @@ -3,4 +3,4 @@ app.grails.version=2.5.5 app.name=apollo app.servlet.version=3.0 -app.version=2.6.7-SNAPSHOT +app.version=2.7.0 diff --git a/docs/conf.py b/docs/conf.py index 3ddd774f5..f6a450d4a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -52,9 +52,9 @@ # built documents. # # The short X.Y version. -version = '2.6' +version = '2.7' # The full version, including alpha/beta/rc tags. -release = '2.6.6' +release = '2.7.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.