Merge branch 'saas' into saas-embed-player

This commit is contained in:
drigato 2015-02-20 14:47:57 -05:00
commit 40d6249229
28 changed files with 321 additions and 9900 deletions

View file

@ -55,7 +55,8 @@ $ccAcl->allow('G', 'index')
->allow('G', 'upgrade')
->allow('G', 'provisioning')
->allow('G', 'downgrade')
->allow('G', 'rest:show-image')
->allow('G', 'rest:show-image', 'get')
->allow('H', 'rest:show-image')
->allow('G', 'rest:media', 'get')
->allow('H', 'rest:media')
->allow('H', 'preference', 'is-import-in-progress')