Merge branch 'release/4.7.1.2'

This commit is contained in:
James Cole
2018-03-04 13:27:21 +01:00

View File

@@ -33,7 +33,7 @@ return [
'is_demo_site' => false, 'is_demo_site' => false,
], ],
'encryption' => (is_null(env('USE_ENCRYPTION')) || env('USE_ENCRYPTION') === true), 'encryption' => (is_null(env('USE_ENCRYPTION')) || env('USE_ENCRYPTION') === true),
'version' => '4.7.1', 'version' => '4.7.1.2',
'api_version' => '0.1', 'api_version' => '0.1',
'maxUploadSize' => 15242880, 'maxUploadSize' => 15242880,
'allowedMimes' => [ 'allowedMimes' => [