Merge tag '4.7.17.5' into develop

4.7.17.5

# Conflicts:
#	resources/views/v1/transactions/convert.twig
This commit is contained in:
James Cole
2019-08-02 20:59:57 +02:00
6 changed files with 15 additions and 7 deletions

View File

@@ -125,7 +125,7 @@ return [
'is_demo_site' => false,
],
'encryption' => null === env('USE_ENCRYPTION') || env('USE_ENCRYPTION') === true,
'version' => '4.7.17.4',
'version' => '4.7.17.5',
'api_version' => '0.9.2',
'db_version' => 10,
'maxUploadSize' => 15242880,