Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/getgrav/grav into 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mahagr committed Jul 19, 2017
2 parents 6fadaa0 + 1bfbb71 commit 670f0ce
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@
* Make it possible to include debug bar also into non-HTML responses

# v1.3.1
## 07/xx/2017
## 07/19/2017

1. [](#bugfix)
* Fix ordering for Linux + International environments [#1574](https://github.com/getgrav/grav/issues/1574)
* Check if medium thumbnail exists before resetting
* Update Travis' auth token

# v1.3.0
## 07/16/2017
Expand Down
2 changes: 1 addition & 1 deletion system/defines.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

// Some standard defines
define('GRAV', true);
define('GRAV_VERSION', '1.3.0');
define('GRAV_VERSION', '1.3.1');
//define('GRAV_TESTING', true);
define('DS', '/');

Expand Down

0 comments on commit 670f0ce

Please sign in to comment.