mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-24 01:16:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge branch 'develop' of github.com:ether/etherpad-lite into new-icons

Browse source
This commit is contained in:
John McLear 2014-11-19 00:17:01 +00:00
commit 16d8068d7d
3 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/templates/pad.html
View file

@ -41,7 +41,11 @@
<% e.begin_block("styles"); %>
<link href="../static/css/pad.css" rel="stylesheet">
<% e.begin_block("customStyles"); %>
<link href="../static/custom/pad.css" rel="stylesheet">
<% e.end_block(); %>
<style title="dynamicsyntax"></style>
<% e.end_block(); %>
@ -345,7 +349,9 @@
<script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/pad.js?callback=require.define"></script>
<script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/ace2_common.js?callback=require.define"></script>
<% e.begin_block("customScripts"); %>
<script type="text/javascript" src="../static/custom/pad.js"></script>
<% e.end_block(); %>
<!-- Bootstrap page -->
<script type="text/javascript">