Jim Laurie 5bf1e51422 Fix conflicts

2018-02-12 13:25:43 +01:00

..

environments

Merge branch 'master' into enhancement/database-uri

2018-02-07 15:00:37 +01:00

functions

Use arrow function in CRON file

2017-10-11 12:08:45 +02:00

locales

Form multi repos to mono repo workflow

2016-03-18 11:12:50 +01:00

application.json

Set application name and description in database

2018-02-05 14:16:32 +01:00

custom.json

Created empty view for homepage

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

hook.json

Update default hook timeout to 3000 milliseconds

2018-02-09 16:36:23 +01:00

language.json

Update dependencies and focus on performances

2017-08-05 20:25:57 +02:00

middleware.json

Load gzip middleware before in the stack to work with Boom #544

2018-02-06 16:18:28 +01:00