Keep concrete5 composer.lock
Change force upgrade url to new url
Merge pull request #1032 from mlocati/keep-composer-lock

Keep concrete5 composer.lock
Merge pull request #1200 from Mnkras/patch-1

Change force upgrade url to new url
File manager should always return a value when form is submitted

If you would clear a file from the file manager popup, it would not get saved. If you would reload the page and edit the block, the file would still be there. The reason for that is that the file manager would return no value when no file is present. I think it's better to change that, so you can add the file manager to a block and have the 'clear' functionality work out of the box.
Revert "tweaks to z-index"

This reverts commit dad3e40eca4d966ea73ead1a3774b071e6811dcf.
Merge branch 'develop' of https://github.com/KorvinSzanto/concrete5-5.7.0 into KorvinSzanto-develop
Rescan blocks after canceling inline content block form.
migration bug fixes
tweaks to name
making update work
Fixing issues with update
Merge branch 'develop' of https://github.com/KorvinSzanto/concrete5-5.7.0 into KorvinSzanto-develop
Merge branch 'develop' into KorvinSzanto-develop
Merge pull request #1371 from KorvinSzanto/fix-1370

Rescan blocks after canceling inline content block form.
Make block.js resolve the block correctly when added to grid areas
Preparing for 5.7.1
updating config db
Fix adding attribute keys and categories in packages.
PSR-2