Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

# Conflicts: # CHANGELOG.md
getgrav · May 17, 2017 · 0128416 · 0128416
2 parents 0269ec5 + 6496508
commit 0128416
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,8 +8,8 @@
     * Added `Grav\Framework\Page` interfaces
     * Deprecated GravTrait
 
-# v1.2.5
-## mm/dd/2017
+# v1.3.0-rc.1
+## 15/16/2017
 
 1. [](#new)
     * Added support for a single array field in the forms

diff --git a/system/defines.php b/system/defines.php
@@ -8,8 +8,8 @@
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '1.2.4');
-define('GRAV_TESTING', false);
+define('GRAV_VERSION', '1.3.0-rc.1');
+define('GRAV_TESTING', true);
 define('DS', '/');
 
 if (!defined('GRAV_PHP_MIN')) {