]> BookStack Code Mirror - bookstack/commit
Merge branch 'drawing_updates'
authorDan Brown <redacted>
Sun, 27 May 2018 18:42:25 +0000 (19:42 +0100)
committerDan Brown <redacted>
Sun, 27 May 2018 18:42:25 +0000 (19:42 +0100)
commit6b84a76af1917ff8e53c4636cb5fe08d1b40ccdd
treea0bb818ec1d191653ae569ab0206c31e7feb10c1
parent9ec114641c35eaedfa5d6b00b82b06dad2b8c050
parent2bd6ba98955bea62be0bedd09cf3a6d20f42c50a
Merge branch 'drawing_updates'
resources/assets/js/components/wysiwyg-editor.js
resources/lang/en/settings.php
resources/lang/sv/components.php
routes/web.php