mirror of
				https://github.com/firefly-iii/firefly-iii.git
				synced 2025-10-31 10:47:00 +00:00 
			
		
		
		
	Merge branch 'hotfix/4.6.3.1'
This commit is contained in:
		| @@ -2,6 +2,10 @@ | ||||
| All notable changes to this project will be documented in this file. | ||||
| This project adheres to [Semantic Versioning](http://semver.org/). | ||||
|  | ||||
| ## [4.6.3.1] - 2017-07-23 | ||||
| ### Fixed | ||||
| - Hotfix to close issue #715 | ||||
|  | ||||
|  | ||||
| ## [4.6.3] - 2017-07-23 | ||||
|  | ||||
|   | ||||
| @@ -23,7 +23,7 @@ return [ | ||||
|         'is_demo_site'     => false, | ||||
|     ], | ||||
|     'encryption'                 => (is_null(env('USE_ENCRYPTION')) || env('USE_ENCRYPTION') === true), | ||||
|     'version'                    => '4.6.3', | ||||
|     'version'                    => '4.6.3.1', | ||||
|     'maxUploadSize'              => 15242880, | ||||
|     'allowedMimes'               => ['image/png', 'image/jpeg', 'application/pdf'], | ||||
|     'list_length'                => 10, | ||||
|   | ||||
| @@ -111,7 +111,7 @@ | ||||
|                                                    title="{{ 'test_rule_triggers'|_ }}"><i data-id="{{ rule.id }}" class="fa fa-fw fa-flask"></i></a> | ||||
|  | ||||
|                                                 {# actually execute rule #} | ||||
|                                                 <a href="{{ route('rules.select-transactions',ruleGroup.id) }}" class="btn btn-default" | ||||
|                                                 <a href="{{ route('rules.select-transactions',rule.id) }}" class="btn btn-default" | ||||
|                                                    title=" {{ trans('firefly.apply_rule_selection', {title: rule.title}) }}"> | ||||
|                                                     <i class="fa fa-fw fa-power-off "></i></a> | ||||
|                                             </div> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user