commit de4c13d8e7bfd5151389c92857c66d351ce17f72
author William Hesse <whesse@google.com> Tue Jun 20 13:25:13 2017 +0200
committer William Hesse <whesse@google.com> Tue Jun 20 13:25:13 2017 +0200
tree 7ae1f9cf4f0b1a833130adf632e81eb70e6673cf
parent f4e09979740be7ac1bf45ad4a938232eba1d9502
parent 8ba4f78dd30981372e5e14966f8576346b7f5a74

Version 1.25.0-dev.2.0

Merge commit '8ba4f78dd30981372e5e14966f8576346b7f5a74' into dev

CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa76f9c..510ca6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,7 +39,7 @@
     * Fixed a Safari issue during bootstrapping (note that Safari is still not
       officially supported but does work for trivial examples).
 
-## 1.24.0
+## 1.24.0 - 12-06-2017
 
 ### Language
 * During a dynamic type check, `void` is not required to be `null` anymore.

tools/VERSION

diff --git a/tools/VERSION b/tools/VERSION
index 42b167d..1988e4e 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -23,9 +23,9 @@
 #  * Making cherry-picks to stable channel
 #     - increase PATCH by 1
 #
-CHANNEL be
+CHANNEL dev
 MAJOR 1
 MINOR 25
 PATCH 0
-PRERELEASE 0
+PRERELEASE 2
 PRERELEASE_PATCH 0