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