Merge branch 'develop' into staging

2017-01-16 18:23:33 +01:00 · 2017-01-16 18:23:33 +01:00 · 6c98b7ab1e
commit 6c98b7ab1e
parent bfe1d7469d 5b99c18b67
3 changed files with 5 additions and 5 deletions
--- a/.gitignore.swp
+++ b/.gitignore.swp
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -701,4 +701,4 @@ DEPENDENCIES
  will_paginate-bootstrap

 BUNDLED WITH
-   1.13.6
+   1.13.7
--- a/README.md
+++ b/README.md
@ -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