Merge branch 'afterEditHook' of github.com:ether/etherpad-lite into getAttributeOnSelection
This commit is contained in:
commit
20b27c602c
|
@ -154,6 +154,7 @@
|
||||||
<% e.end_block(); %>
|
<% e.end_block(); %>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
<% e.begin_block("afterEditbar"); %><% e.end_block(); %>
|
||||||
|
|
||||||
<div id="users">
|
<div id="users">
|
||||||
<% e.begin_block("userlist"); %>
|
<% e.begin_block("userlist"); %>
|
||||||
|
|
Loading…
Reference in New Issue