mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-04-24 17:36:14 -04:00
Merge branch 'develop' of git://github.com/Pita/etherpad-lite
This commit is contained in:
commit
6120a0b7aa
20 changed files with 1197 additions and 295 deletions
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"pad.js": [
|
||||
"jquery.js"
|
||||
, "underscore.js"
|
||||
, "security.js"
|
||||
, "pad.js"
|
||||
, "ace2_common.js"
|
||||
|
@ -25,6 +26,7 @@
|
|||
]
|
||||
, "timeslider.js": [
|
||||
"jquery.js"
|
||||
, "underscore.js"
|
||||
, "security.js"
|
||||
, "undo-xpopup.js"
|
||||
, "json2.js"
|
||||
|
@ -51,6 +53,8 @@
|
|||
]
|
||||
, "ace2_inner.js": [
|
||||
"ace2_common.js"
|
||||
, "underscore.js"
|
||||
, "rjquery.js"
|
||||
, "AttributePoolFactory.js"
|
||||
, "Changeset.js"
|
||||
, "security.js"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue