Skip to content
Commit f57f33ec authored by antograssiot's avatar antograssiot
Browse files

Merge branch '3.0' 

Conflicts:
	themes/cakephp/layout.html
	themes/cakephp/static/app.js
parents 26e67746 608bbcb7
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