kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-07 13:23:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'release/3.6.1' into develop

Browse Source 
Conflicts:
	composer.lock
This commit is contained in:
James Cole
2016-01-09 14:31:52 +01:00
parent 681bc580c4 fdca234721
commit e094871bc9
2 changed files with 2 additions and 2 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.6.0',
'version' => '3.6.1',
'index_periods' => ['1D', '1W', '1M', '3M', '6M', '1Y', 'custom'],
'budget_periods' => ['daily', 'weekly', 'monthly', 'quarterly', 'half-year', 'yearly'],
'csv_import_enabled' => true,