Merge branch 'develop' into staging

This commit is contained in:
Mathieu Magnin 2017-01-16 18:23:33 +01:00
commit 6c98b7ab1e
3 changed files with 5 additions and 5 deletions

Binary file not shown.

View file

@ -701,4 +701,4 @@ DEPENDENCIES
will_paginate-bootstrap
BUNDLED WITH
1.13.6
1.13.7

View file

@ -28,7 +28,7 @@ Les informations nécessaire à l'initialisation de la base doivent être pré-c
su - postgres
psql
> create user tps with password 'lol' createdb;
> create user tps with password 'lol' superuser;
> \q