Merge branch 'master' into dropzone-timeout

This commit is contained in:
Dan Brown
2018-12-22 15:08:54 +00:00
65 changed files with 2348 additions and 582 deletions

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.',
];