Skip to content
Commit ae2e38c3 authored by André Teixeira's avatar André Teixeira
Browse files

Merge branch '3.0' of https://github.com/cakephp/docs into pt-3-0-migration-guide 

Conflicts:
	en/appendices/3-0-migration-guide.rst
	pt/appendices/3-0-migration-guide.rst
parents f3b0eecd 83144a23
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