mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-22 16:36:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 33

Merge branch 'develop' into objectify_ep

Browse source 
Conflicts:
	src/node/utils/tar.json
	src/static/js/ace2_inner.js
This commit is contained in:
Matthias Bartelmeß 2012-03-27 11:15:48 +02:00
commit daca484747
20 changed files with 1196 additions and 344 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/node/utils/tar.json
View file

@ -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"
, "AttributePool.js"
, "Changeset.js"
, "security.js"