Revision 4c001b5847c93d61184dfadfce3998cd593520b0

Committed on 11/10/2019 4:16 am by Andrew Longosz <[email protected]> [GitHub Diff]

Merge branch '2.5'

* Resolved conflict in lib/FieldType/Mapper/PageFormMapper.php

* Deleted accidentally added lib/FieldType/Mapper/PageFormMapper.php (see 7cdc37e)