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

This commit is contained in:
Peter 'Pita' Martischka 2011-08-16 17:22:15 +01:00
commit 1151ec3278
28 changed files with 2172 additions and 190 deletions

View file

@ -3,7 +3,7 @@
*/
/*
* 2011 Peter 'Pita' Martischka
* 2011 Peter 'Pita' Martischka (Primary Technology Ltd)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.