Peter Papp 5d0348e2d0 Merge remote-tracking branch 'origin/v2' into oasis ...

# Conflicts:
#	app/Http/Controllers/User/AccountController.php
#	app/Http/helpers.php
#	public/mix-manifest.json
#	resources/js/components/FilesView/Icons/AlphabetIcon.vue
#	resources/js/components/FilesView/MobileActionButton.vue
#	resources/js/views/Admin/AppSettings/AppSettingsTabs/Appearance.vue
#	resources/js/views/Admin/Users/UserTabs/UserDetail.vue
#	resources/js/views/Upgrade/UpgradeBilling.vue
#	resources/views/index.blade.php
#	resources/views/vuefilemanager/invoice.blade.php
#	resources/views/vuefilemanager/others/color-template.blade.php

2021-04-01 10:45:10 +02:00

..

factories

helpers refactoring

2021-03-31 08:27:28 +02:00

migrations

Merge remote-tracking branch 'origin/v2' into oasis

2021-04-01 10:45:10 +02:00

seeds

Upgrading laravel from v7 to v8

2021-02-25 16:47:32 +01:00

.gitignore

Initial commit

2020-03-10 19:00:32 +01:00