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

..

src

Implemented custom cms format, and associated administration pages.

2017-03-30 11:58:44 +02:00

test

Implemented custom cms format, and associated administration pages.

2017-03-30 11:58:44 +02:00

embedded_video-safe.ecf

Merge branch 'master' into es17.01

2017-03-30 12:03:41 +02:00

embedded_video.ecf

Merge branch 'master' into es17.01

2017-03-30 12:03:41 +02:00