kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-18 15:39:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into 5.8-dev

Browse Source 
# Conflicts:
#	composer.lock
This commit is contained in:
James Cole
2022-08-03 05:40:31 +02:00
parent 39a928d7f4 aa3fba91d4
commit 4d1b21f70d
68 changed files with 572 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/lang/en_US/config.php
View File

@@ -53,7 +53,7 @@ return [
'year_js' => 'YYYY',
//'half_year' => '%B %Y',
'half_year_js' => 'Q YYYY',
'half_year_js' => '\QQ YYYY',
'quarter_fns' => "'Q'Q, yyyy",
'half_year_fns' => "'H{half}', yyyy",