diff --git a/CHANGELOG.md b/CHANGELOG.md index 27830d321..955c87d34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ # v1.2.0 -## 03/xx/2017 +## 03/31/2017 1. [](#new) * Added file upload for user avatar in user/admin blueprint diff --git a/system/config/system.yaml b/system/config/system.yaml index 3ef29e623..99628151c 100644 --- a/system/config/system.yaml +++ b/system/config/system.yaml @@ -134,7 +134,7 @@ session: path: gpm: - releases: testing # Set to either 'stable' or 'testing' + releases: stable # Set to either 'stable' or 'testing' proxy_url: # Configure a manual proxy URL for GPM (eg 127.0.0.1:3128) method: 'auto' # Either 'curl', 'fopen' or 'auto'. 'auto' will try fopen first and if not available cURL verify_peer: true # Sometimes on some systems (Windows most commonly) GPM is unable to connect because the SSL certificate cannot be verified. Disabling this setting might help. diff --git a/system/defines.php b/system/defines.php index 2ee857983..1865c871a 100644 --- a/system/defines.php +++ b/system/defines.php @@ -8,8 +8,8 @@ // Some standard defines define('GRAV', true); -define('GRAV_VERSION', '1.2.0-rc.3'); -define('GRAV_TESTING', true); +define('GRAV_VERSION', '1.2.0'); +define('GRAV_TESTING', false); define('DS', '/'); if (!defined('GRAV_PHP_MIN')) {