webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-08-07 23:03:00 +03:00
Code Activity

Merge branch 'master' into dropzone-timeout

Browse Source
This commit is contained in:
Dan Brown
2018-12-22 15:08:54 +00:00
parent d3d3e2ad3e d910defbfd
commit 5fe630b8d2
65 changed files with 2348 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
resources/lang/en/errors.php
View File

@@ -1,11 +1,9 @@
<?php
/**
* Text shown in error messaging.
*/
return [
/**
* Error text strings.
*/
// Permissions
'permission' => 'You do not have permission to access the requested page.',
'permissionJson' => 'You do not have permission to perform the requested action.',
@@ -81,4 +79,5 @@ return [
'error_occurred' => 'An Error Occurred',
'app_down' => ':appName is down right now',
'back_soon' => 'It will be back up soon.',
];