Skip to content

Commit

Permalink
Merge branch 'hotfix' into 1090-user-competence
Browse files Browse the repository at this point in the history
  • Loading branch information
willkoua committed May 21, 2016
2 parents ede6294 + c7f8f46 commit ffe5a18
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,8 @@
* the following line and set the port accordingly
*/
//'port' => 'nonstandard_port_number',
'username' => 'root', //mllAdmin
'password' => '', //toto
'username' => 'mllAdmin',
'password' => 'toto',
'database' => 'mll_site',
'encoding' => 'utf8',
'timezone' => 'UTC',
Expand Down

0 comments on commit ffe5a18

Please sign in to comment.