mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

merge develop

Browse source
This commit is contained in:
John McLear 2013-02-25 10:13:50 +00:00
commit f915285f15
23 changed files with 689 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/static/js/timeslider.js
View file

@ -29,6 +29,7 @@ var createCookie = require('./pad_utils').createCookie;
var readCookie = require('./pad_utils').readCookie;
var randomString = require('./pad_utils').randomString;
var _ = require('./underscore');
var hooks = require('./pluginfw/hooks');
var token, padId, export_links;
@ -108,6 +109,7 @@ function init() {
exports.socket = socket; // make the socket available
hooks.aCallAll("postTimesliderInit");
});
}