Merge branch 'develop' into feature/credit_calc

# Conflicts:
#	app/Repositories/Account/AccountRepository.php
This commit is contained in:
James Cole
2021-05-02 06:27:32 +02:00
99 changed files with 1254 additions and 555 deletions

View File

@@ -100,7 +100,7 @@ return [
'handle_debts' => true,
],
'version' => '5.5.9',
'version' => '5.5.10',
'api_version' => '1.5.2',
'db_version' => 16,
'maxUploadSize' => 1073741824, // 1 GB