Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2025-11-01 19:05:58 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'release/1.1.15' into develop

Browse Source
This commit is contained in:
Andy Miller
2017-01-30 14:14:16 -07:00
parent f37bebaacd e17721b4bd
commit d269989c50
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -1,5 +1,5 @@
# v1.1.15 # v1.1.15
## xx/xx/2017 ## 01/30/2017
1. [](#new) 1. [](#new)
* Added a new `Collection::merge()` method to allow merging of multiple collections [#1258](https://github.com/getgrav/grav/pull/1258) * Added a new `Collection::merge()` method to allow merging of multiple collections [#1258](https://github.com/getgrav/grav/pull/1258)

2
system/defines.php
View File

@@ -8,7 +8,7 @@
// Some standard defines // Some standard defines
define('GRAV', true); define('GRAV', true);
define('GRAV_VERSION', '1.1.14'); define('GRAV_VERSION', '1.1.15');
define('GRAV_TESTING', false); define('GRAV_TESTING', false);
define('DS', '/'); define('DS', '/');
define('GRAV_PHP_MIN', '5.5.9'); define('GRAV_PHP_MIN', '5.5.9');