Matias Griese 7217635c6f Merge branches 'develop' and 'feature/objects' of https://github.com/getgrav/grav into feature/objects ... # Conflicts: # CHANGELOG.md		2017-05-05 09:30:59 +03:00
..
assets	Add jQuery 3.x #1070	2016-10-03 17:18:00 +02:00
blueprints	Added support for showModular option in Pages::getList()	2017-04-21 22:18:36 -06:00
config	Added new pwd_regex and username_regex system configuration options	2017-04-13 15:03:20 -06:00
images/media	Add empty thumb.png image as default	2015-12-23 16:30:12 +01:00
languages	Fixed up the languages	2016-07-13 17:07:08 -06:00
pages	Refactored onPageNotFound event to fire after onPageInitialized	2016-09-08 12:30:34 -06:00
src/Grav	Merge branches 'develop' and 'feature/objects' of https://github.com/getgrav/grav into feature/objects	2017-05-05 09:30:59 +03:00
defines.php	Prepare for release	2017-04-24 15:31:57 -06:00
router.php	Reworked PHP CLI router PR #1218 (#1219)	2016-12-17 15:07:40 +01:00