Merge branch 'release/1.1.0'

getgrav · Jul 14, 2016 · 231bc81 · 231bc81
2 parents f8adf87 + 82f453e
commit 231bc81
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
     * Added support for validation of multiple email in the `type: email` field [grav-plugin-email#31](https://github.com/getgrav/grav-plugin-email/issues/31)
     * Unified PHP code header styling
     * Added 6 more languages and updated language codes
+    * set default "releases" option to `stable`
 1. [](#bugfix)
     * Fix backend validation for file fields marked as required [grav-plugin-form#78](https://github.com/getgrav/grav-plugin-form/issues/78)
 

diff --git a/system/config/system.yaml b/system/config/system.yaml
@@ -125,5 +125,5 @@ session:
   httponly: true                            # Set session HTTP only. If true, indicates that cookies should be used only over HTTP, and JavaScript modification is not allowed.
 
 gpm:
-  releases: testing                           # Set to either 'stable' or 'testing'
-  proxy_url:                                  # Configure a manual proxy URL for GPM (eg 127.0.0.1:3128)
+  releases: stable                           # Set to either 'stable' or 'testing'
+  proxy_url:                                 # Configure a manual proxy URL for GPM (eg 127.0.0.1:3128)