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

This commit is contained in:
Djamil Legato
2018-10-02 10:45:39 -07:00
2 changed files with 2 additions and 2 deletions

View File

@@ -147,7 +147,7 @@ session:
path:
gpm:
releases: stable # Set to either 'stable' or 'testing'
releases: testing # 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.

View File

@@ -8,7 +8,7 @@
// Some standard defines
define('GRAV', true);
define('GRAV_VERSION', '1.6.0-beta.1');
define('GRAV_VERSION', '1.6.0-beta.2');
define('GRAV_TESTING', true);
define('DS', '/');