Continue merge.

This commit is contained in:
cahrens
2013-05-27 20:28:56 -04:00
parent 34082efad5
commit 851ed6722a

View File

@@ -1,4 +1,4 @@
<%include file="metadata-edit.html" />
<div class="wrapper-comp-editor" id="editor-tab">
<section class="combinedopenended-editor editor">
<div class="row">
%if enable_markdown:
@@ -93,3 +93,5 @@
</div>
</article>
</script>
</div>
<%include file="metadata-edit.html" />