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
..
v1	Merge tag '4.7.17.6' into develop	2019-08-03 05:11:58 +02:00
v2	Replace \get_class with get_class	2019-06-07 18:20:15 +02:00