]> BookStack Code Mirror - bookstack/commitdiff
Merge pull request #8 from BookStackApp/master
authorAbijeet Patro <redacted>
Sat, 25 Mar 2017 18:26:05 +0000 (23:56 +0530)
committerGitHub <redacted>
Sat, 25 Mar 2017 18:26:05 +0000 (23:56 +0530)
Getting the latest changes.

1  2 
config/database.php

Simple merge