Peter 'Pita' Martischka 42662d73d0 Merge branch 'master' of /home/jose/etherpad-lite/

2011-08-20 18:23:58 +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

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

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

ExportHtml.js

fixed #61

2011-08-10 17:48:36 +01:00

Minify.js

added a colorPicker

2011-08-20 18:22:10 +01:00

Settings.js

forgot to change the default settings in Settings.js

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