Skip to content
Commit cbce5e15 authored by Jose Lorenzo Rodriguez's avatar Jose Lorenzo Rodriguez
Browse files

Merge remote-tracking branch 'origin/1.3' into 1.3 

Conflicts:
	en/The-Manual/Appendices/Migrating-from-CakePHP-1-2-to-1-3.rst
	en/The-Manual/Common-Tasks-With-CakePHP/Testing.rst
	en/The-Manual/Core-Helpers/Js.rst
parents 5218c94a 19edd2c3
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment