Peter 'Pita' Martischka d391dab558 fixed merge conflict

2012-01-22 15:23:50 +01:00

..

Abiword.js

Merge branch 'api' of ../etherpad-lite.dev/

2011-08-16 17:22:15 +01:00

AttributePoolFactory.js

changed copyright from Peter 'Pita' Martischka to Peter 'Pita' Martischka (Primary Technology Ltd)

2011-08-11 15:27:16 +01:00

Changeset.js

Added some comments to help us documentating the code

2011-12-11 19:45:40 +01:00

contentcollector.js

Ordered list support

2012-01-15 17:20:20 +00:00

customError.js

replaced all stop callbacks with customError callbacks. Fixes #270

2011-12-10 16:46:47 +01:00

ExportDokuWiki.js

Add DokuWiki export

2011-12-07 13:03:08 +01:00

ExportHtml.js

Ordered list support

2012-01-15 17:20:20 +00:00

ImportHtml.js

fixed #250

2011-12-04 17:09:31 +01:00

Minify.js

fixed merge conflict

2012-01-22 15:23:50 +01:00

Settings.js

fixed merge conflict

2012-01-22 15:23:50 +01:00

tar.json

Move packaging info into its own file.

2012-01-15 01:52:58 -08:00