adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
cakephp2-php8/cake/config
History
Mark Story 6a3347ef7c Merge remote branch 'origin/1.2' into 1.2-merger 
Conflicts:
	cake/VERSION.txt
	cake/config/config.php
	cake/console/libs/tasks/model.php
	cake/dispatcher.php
	cake/libs/l10n.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/text.test.php
2010-02-20 01:32:04 -05:00
..
unicode/casefolding Merge branch '1.2' into 1.3-merger 2010-01-26 17:54:34 -05:00
config.php Merge remote branch 'origin/1.2' into 1.2-merger 2010-02-20 01:32:04 -05:00
paths.php Merge branch '1.2' into 1.3-merger 2010-01-26 17:54:34 -05:00