Andy Miller a65c21acba Merge branch 'develop' into 1.7 ...

Signed-off-by: Andy Miller <rhuk@mac.com>

# Conflicts:
#	CHANGELOG.md
#	system/blueprints/config/system.yaml

2020-06-04 14:46:54 -06:00

..

backups.yaml

Squashed commit of the following:

2018-09-19 15:44:31 -06:00

media.yaml

Added support for webp (must be defined in media.yaml) #1168

2020-04-23 12:35:05 -06:00

permissions.yaml

Added support for custom permissions in configuration

2020-01-15 20:04:08 +02:00

security.yaml

Added a new sanitize_svg security config option [default: true]

2019-09-03 12:07:47 -06:00

site.yaml

reformatted the site.yaml a little

2019-02-18 12:59:56 -07:00

streams.yaml

Make asset and image stream read/write

2018-09-04 09:24:18 +03:00

system.yaml

Merge branch 'develop' into 1.7

2020-06-04 14:46:54 -06:00