Merge remote branch 'ether/develop'

This commit is contained in:
Iván Eixarch 2012-11-23 22:57:05 +01:00
commit 0250f8d55c
12 changed files with 77 additions and 39 deletions

View file

@ -26,7 +26,7 @@ exports.createServer = function () {
{
console.warn("Can't get git version for server header\n" + e.message)
}
console.log("Report bugs at https://github.com/Pita/etherpad-lite/issues")
console.log("Report bugs at https://github.com/ether/etherpad-lite/issues")
serverName = "Etherpad-Lite " + version + " (http://j.mp/ep-lite)";