Merge branch 'develop' into feature/settings

This commit is contained in:
slawkens
2021-03-05 10:10:51 +01:00
707 changed files with 3108 additions and 38167 deletions

8
.gitignore vendored
View File

@@ -3,6 +3,10 @@ Thumbs.db
.idea
tmp
# composer
composer.lock
vendor
releases
config.local.php
PERSONAL_NOTES
@@ -40,6 +44,10 @@ plugins/*
!plugins/example-settings-plugin.json
!plugins/example-settings-plugin
landing
/login.php
# system
system/functions_custom.php
# others/rest
system/pages/downloads.php