]> BookStack Code Mirror - bookstack/commit
Merge branch 'BookStackApp-master' of git://github.com/OsmosysSoftware/BookStack...
authorDan Brown <redacted>
Wed, 6 Dec 2017 15:52:54 +0000 (15:52 +0000)
committerDan Brown <redacted>
Wed, 6 Dec 2017 15:52:54 +0000 (15:52 +0000)
commitbc1302a8d8c9c7facb16b28e1cf1da4409e7ede0
treead17483535f2370c41b8396ca729fef30a9d76d7
parenteeb2b8cbe5cfe5181e42118d6e81eeabfd83c45a
parent5034f21394e5dc52965094d885fdb75106836c19
Merge branch 'BookStackApp-master' of git://github.com/OsmosysSoftware/BookStack into OsmosysSoftware-BookStackApp-master
app/Http/Controllers/BookController.php
resources/assets/js/global.js
resources/assets/sass/styles.scss
resources/lang/en/common.php
resources/lang/en/settings.php
resources/lang/nl/common.php
resources/lang/pt_BR/common.php
resources/lang/pt_BR/settings.php
tests/UserProfileTest.php