Guy Sartorelli 6259ca30ad

Merge branch '4' into 5.0 ...

# Conflicts:
#	client/dist/js/TinyMCE_sslink-anchor.js
#	client/dist/js/TinyMCE_sslink-internal.js
#	composer.json
#	tests/behat/features/insert-a-link.feature
#	tests/behat/features/insert-anchor-link.feature

2023-09-18 11:10:29 +12:00

..

behat

Merge branch '4' into 5.0

2023-09-18 11:10:29 +12:00

bootstrap

ENH PHP 8.1 compatibility

2022-04-13 17:07:59 +12:00

php

Merge branch '4' into 5.0

2023-09-05 15:19:35 +12:00

bootstrap.php

FIX Fixture the 'app' dir instead of mysite in unit tests

2018-04-11 19:04:45 +12:00