]> BookStack Code Mirror - bookstack/commit
Merge branch 'master' into dropzone-timeout
authorDan Brown <redacted>
Sat, 22 Dec 2018 15:08:54 +0000 (15:08 +0000)
committerDan Brown <redacted>
Sat, 22 Dec 2018 15:08:54 +0000 (15:08 +0000)
commit5fe630b8d208297ff6cfd0fdd9389cfa30b8dd6c
tree333c2f268d6907b3e53ccc3c79d08f9b80dcad2d
parentd3d3e2ad3e2ce2cfff2672df9109ca15bfcf14e4
parentd910defbfd7198150bb10e8f02d55e329188a930
Merge branch 'master' into dropzone-timeout
resources/lang/en/errors.php
resources/lang/es_AR/errors.php
resources/lang/pl/errors.php