Jim Laurie c2d35be9b5 Fix conflicts

2017-09-27 13:56:10 +02:00

..

custom.json

Created empty view for homepage

2017-08-16 18:47:02 +02:00

database.json

Fix languages after pull alpha5

2017-08-03 14:06:59 +02:00

request.json

Fix conflicts

2017-09-27 13:56:10 +02:00

response.json

Merge

2017-09-08 13:46:50 +02:00

security.json

Update p3p xss csp and session config

2017-09-19 10:06:16 +02:00

server.json

Change autoReload config

2017-09-19 08:55:38 +02:00