Peter 'Pita' Martischka 7296913cb0 fixed merge confilicts

2011-11-25 16:56:08 -08: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

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

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

contentcollector.js

The contentcollector code is harder to adapt since it has the Changeset module as a dependency

2011-11-17 10:26:32 +01:00

ExportHtml.js

Merge pull request #191 from Yaco-Sistemas/master

2011-11-12 15:04:53 -08:00

ImportHtml.js

Stupid syntax error due to last minute refactoring

2011-11-22 16:09:27 +01:00

Minify.js

put expolorer canvas into minify

2011-08-21 19:20:18 +01:00

Settings.js

forgot to change the default settings in Settings.js

2011-08-17 19:26:56 +01:00