2 Commits

Author	SHA1	Message	Date
Jocelyn Fiat	c261554a39	Merge branch 'master' into es17.01 ... # Conflicts: # examples/demo/demo.ecf # modules/admin/admin-safe.ecf	2017-03-30 12:03:41 +02:00
Jocelyn Fiat	0ce7d11e52	Implemented custom cms format, and associated administration pages. ... Applied to existing filter and format. Added embedded_video filter (initially contribute by Javier Velilla).	2017-03-30 11:58:44 +02:00