]> BookStack Code Mirror - bookstack/commit
Resolved conflicts
authorBharadwaja G <redacted>
Thu, 24 Aug 2017 06:51:43 +0000 (12:21 +0530)
committerBharadwaja G <redacted>
Thu, 24 Aug 2017 06:51:43 +0000 (12:21 +0530)
commit7f902e41c7a6a18a754bb889c2655aa4fba736ec
treea83f9d9c1b82d4b261307ffbf5b5c2d20490ad1d
parent3079a9f4de26d7507fdb51822e4c13278f42ee91
parent28a9bd514f65638c78b07380d75dfb01070cff0c
Resolved conflicts
resources/assets/js/global.js
resources/assets/sass/styles.scss
resources/lang/de/common.php
resources/lang/de/settings.php
resources/lang/en/settings.php
resources/lang/fr/common.php
resources/lang/fr/settings.php
resources/views/components/image-picker.blade.php