Revision 0663ab682302cc89bb9d8ea25803fe809359757e
Committed on 16/03/2020 7:27 am by
Mateusz <mateusz@mateuszdebinski.pl> [GitHub Diff]
Merge remote-tracking branch 'origin/2.5'
# Conflicts:
# bundle/Controller/UserController.php
# lib/Content/View/Builder/ContentEditViewBuilder.php
# lib/Form/Type/FieldType/FloatFieldType.php