Merge branch 'release/3.4.6' into develop

This commit is contained in:
James Cole committed 2015-06-29 09:53:26 +02:00
commit 087eb5dbe6
3 files changed
+3 -3

No files matched your search

+1 -1
View File
@@ -1,4 +1,4 @@
# Firefly III (v3.4.5)
# Firefly III (v3.4.6)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/JC5/firefly-iii/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/JC5/firefly-iii/?branch=master)
[![Code Coverage](https://scrutinizer-ci.com/g/JC5/firefly-iii/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/JC5/firefly-iii/?branch=master)
+1 -1
View File
@@ -7,7 +7,7 @@ use Twig_SimpleFilter;
/**
* @codeCoverageIgnore
*
*
* Class Budget
*
* @package FireflyIII\Support\Twig
+1 -1
View File
@@ -2,7 +2,7 @@
return [
'chart' => 'chartjs', // or 'chartjs'
'version' => '3.4.5',
'version' => '3.4.6',
'index_periods' => ['1D', '1W', '1M', '3M', '6M', '1Y', 'custom'],
'budget_periods' => ['daily', 'weekly', 'monthly', 'quarterly', 'half-year', 'yearly'],
'piggy_bank_periods' => [