Skip to content
Commit 2a5ee830 authored by José Lorenzo Rodríguez's avatar José Lorenzo Rodríguez
Browse files

Merge pull request #1367 from cakephp-fr/3.0 

reflect new ORM notation in json and xml view
parents 7e183afe 4e85928c
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