summaryrefslogtreecommitdiff
path: root/views/editor.ejs
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-07-17 12:18:45 -0400
committerJules Laplace <jules@okfoc.us>2014-07-17 12:18:45 -0400
commit4ee827ad464dfa0edb664d27e5069811877deb1e (patch)
tree69c6ecb890a6af7f6c247c74f81bc36db591e970 /views/editor.ejs
parentb97f3d39ac0e387385aae2685dbe830ee53a686c (diff)
parentf20841988ccd27780d3801e4a6c32bf9afcc9368 (diff)
merge
Diffstat (limited to 'views/editor.ejs')
-rwxr-xr-xviews/editor.ejs2
1 files changed, 1 insertions, 1 deletions
diff --git a/views/editor.ejs b/views/editor.ejs
index a79eb9a..5d1e052 100755
--- a/views/editor.ejs
+++ b/views/editor.ejs
@@ -13,8 +13,8 @@
<div id="editorView">
[[ include controls/editor/toolbar ]]
- [[ include controls/editor/video-toolbar ]]
[[ include controls/editor/media-drawer ]]
+ [[ include controls/editor/media-editor ]]
[[ include controls/editor/wallpaper ]]
[[ include controls/editor/light-control ]]
[[ include controls/editor/settings ]]