]> BookStack Code Mirror - bookstack/commit
Merge branch 'master' into nwalke-update_site_color
authorDan Brown <redacted>
Sun, 6 Mar 2016 09:08:20 +0000 (09:08 +0000)
committerDan Brown <redacted>
Sun, 6 Mar 2016 09:08:20 +0000 (09:08 +0000)
commit0774ecc89c23d067296abac0298c2e02120917df
tree766604bb61068194b537601fc9e7121fd1d61209
parente3bdc391cd2a40c4c6346645cb30529d7dccd356
parent5e7a4c7fb51294a073d946974855401e86da33e1
Merge branch 'master' into nwalke-update_site_color
app/Http/Controllers/SettingController.php
resources/views/base.blade.php
resources/views/settings/index.blade.php