mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-05-05 22:57:11 -04:00
Merge remote branch 'upstream/master' into nice-pad-url
This commit is contained in:
commit
5af7e8da7f
8 changed files with 51 additions and 251 deletions
|
@ -18,10 +18,10 @@
|
|||
, "pad_impexp.js"
|
||||
, "pad_savedrevs.js"
|
||||
, "pad_connectionstatus.js"
|
||||
, "jquery-ui.js"
|
||||
, "chat.js"
|
||||
, "excanvas.js"
|
||||
, "farbtastic.js"
|
||||
, "prefixfree.js"
|
||||
]
|
||||
, "timeslider.js": [
|
||||
"jquery.js"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue