James Cole 43dbad4e4c Merge tag '4.7.17.6' into develop ... 4.7.17.6 # Conflicts: # .travis.yml # app/Http/Controllers/Import/JobConfigurationController.php # app/Http/Controllers/Transaction/SingleController.php # config/firefly.php		2019-08-03 05:11:58 +02:00
..
assets	Improve test coverage.	2019-08-02 05:25:24 +02:00
lang	First steps for reconciliation fix.	2019-08-02 16:31:36 +02:00
stubs	Various code cleanup.	2017-12-29 09:05:35 +01:00
views	Merge tag '4.7.17.6' into develop	2019-08-03 05:11:58 +02:00