kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-12 01:42:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into adminlte4

Browse Source 
# Conflicts:
#	config/cors.php
#	config/hashing.php
This commit is contained in:
James Cole
2023-08-06 11:25:20 +02:00
parent e3f4e75561 e8c4eec536
commit e1915e365a
8 changed files with 237 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/cors.php
View File

@@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
return [
/*

6
config/hashing.php
View File

@@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
return [
/*
@@ -44,9 +46,9 @@ return [
*/
'argon' => [
'memory' => 65536,
'memory' => 65536,
'threads' => 1,
'time' => 4,
'time' => 4,
],
];