Peter Papp 8ac41837b2 Merge remote-tracking branch 'origin/email-verification' ...

# Conflicts:
#	composer.lock
#	public/mix-manifest.json
#	tests/TestCase.php

2021-07-15 14:00:43 +02:00

..

DashboardController.php

- php fixer upgrade

2021-05-17 10:45:50 +02:00

InvoiceController.php

fixed static issues

2021-05-08 09:41:10 +02:00

LanguageController.php

- chunking translations query

2021-06-07 17:42:53 +02:00

PagesController.php

fixed static issues

2021-05-08 09:41:10 +02:00

PlanController.php

fixed static issues

2021-05-08 09:41:10 +02:00

SettingController.php

fixed static issues

2021-05-08 09:41:10 +02:00

UserController.php

Merge remote-tracking branch 'origin/master' into email-verification

2021-05-26 13:17:39 +02:00