kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-07 14:41:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'hotfix/3.7.2.2' into develop

Browse Source 
Conflicts:
	app/Http/Controllers/RuleGroupController.php
This commit is contained in:
James Cole
2016-02-05 13:23:00 +01:00
parent cb52af28e7 0dfb97c5f7
commit 8e1dbc03d9
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/firefly.php
View File

@@ -2,7 +2,7 @@
return [
'chart' => 'chartjs',
'version' => '3.7.2',
'version' => '3.7.2.2',
'index_periods' => ['1D', '1W', '1M', '3M', '6M', '1Y', 'custom'],
'budget_periods' => ['daily', 'weekly', 'monthly', 'quarterly', 'half-year', 'yearly'],
'csv_import_enabled' => true,