pierreburgy 77389acf78 Fix conflicts

2015-11-10 17:28:44 +01:00

..

_api

Rebuild the dictionary on restart

2015-11-09 15:10:53 +01:00

_config

Improve the restart process on instances

2015-11-10 16:29:34 +01:00

blueprints

…

bodyParser

…

cors

…

cron

…

dashboard

Add addDataCreate and addDataUpdate policies for dashboard routes

2015-11-10 16:54:25 +01:00

favicon

…

grant

take comments into account

2015-11-04 17:59:43 +01:00

gzip

…

i18n

…

ip

…

logger

…

lusca

…

proxy

…

responseTime

…

router

Fix conflicts

2015-11-10 17:28:44 +01:00

session

…

ssl

…

static

…

studio

Improve the restart process on instances

2015-11-10 16:29:34 +01:00

views

…

waterline

Improve the restart process on instances

2015-11-10 16:29:34 +01:00

websockets

…

defaultHooks.js

remove passport, added grant

2015-11-04 17:31:07 +01:00

index.js

…