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

merge with ether/etherpad-lite develop branch

Browse source
This commit is contained in:
ilmar 2018-05-21 16:18:40 +03:00
commit a96aa88dad
5 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/node/utils/ExportHtml.js
View file

@ -371,11 +371,7 @@ function getHTMLFromAtext(pad, atext, authorColors)
if (!exists) {
var prevLevel = 0;
if (prevLine && prevLine.listLevel) {
<<<<<<< HEAD
prevLevel = prevLine.listLevel;
=======
prevlevel = prevLine.listLevel;
>>>>>>> develop
}
if (prevLine && line.listTypeName !== prevLine.listTypeName)
{

2
src/package.json
View file

@ -55,6 +55,6 @@
"repository" : { "type" : "git",
"url" : "http://github.com/ether/etherpad-lite.git"
},
"version" : "1.6.5",
"version" : "1.6.6",
"license" : "Apache-2.0"
}