Andy Miller d6b8ae6297 Merge branch 'develop' into feature/page_level_ssl ...

# Conflicts:
#	system/src/Grav/Common/Markdown/ParsedownGravTrait.php
#	system/src/Grav/Common/Uri.php

2016-01-29 10:30:47 -07:00

..

assets

🚧 Rename jquery-2.2.0.min.js to jquery-2.x.min.js

2016-01-26 13:24:29 +01:00

blueprints

Added proxy_url to config blueprints

2016-01-28 10:34:50 -07:00

config

added example

2016-01-28 10:30:24 -07:00

images/media

Add empty thumb.png image as default

2015-12-23 16:30:12 +01:00

languages

Update hr.yaml

2016-01-15 12:40:58 +01:00

src/Grav

Merge branch 'develop' into feature/page_level_ssl

2016-01-29 10:30:47 -07:00

defines.php

version update

2016-01-08 15:31:23 -07:00