michalsn c32dcd4329
Merge remote-tracking branch 'upstream/develop' into 4.6
# Conflicts:
#	system/Autoloader/Autoloader.php
#	system/BaseModel.php
#	system/CLI/CLI.php
#	system/Database/MigrationRunner.php
#	system/Exceptions/PageNotFoundException.php
#	system/Router/RouteCollection.php
#	system/Validation/FileRules.php
#	tests/system/Autoloader/AutoloaderTest.php
#	tests/system/Filters/FiltersTest.php
#	tests/system/Test/ControllerTestTraitTest.php
#	tests/system/Test/FeatureTestTraitTest.php
#	tests/system/Validation/CreditCardRulesTest.php
#	tests/system/Validation/FileRulesTest.php
#	tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php
#	tests/system/Validation/StrictRules/FileRulesTest.php
#	tests/system/View/ViewTest.php
2024-11-17 12:21:31 +01:00
..