Merge branch 'afterEditHook' of github.com:ether/etherpad-lite into getAttributeOnSelection

This commit is contained in:
John McLear 2013-12-04 23:36:26 +00:00
commit 20b27c602c
1 changed files with 1 additions and 0 deletions

View File

@ -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"); %>