Bugfix for document.domain, and added initialization hook

[redhog]

No description provided.

[JohnMcLear]

Cannot be automatically merged :(

[redhog]

Probably someone changed indentation in the html files then :

It's a bunch of one-line fixes, one for each template...

[redhog]

But I can do a pull / do bthe conflict resolution for you :)

[JohnMcLear]

awesome thanks :) Will try to get it pulled asap

---

From: Egil Möller [reply@reply.github.com]
Sent: 05 April 2012 18:14
To: John McLear
Subject: Re: [etherpad-lite] Bugfix for document.domain, and added initialization hook (#601)

But I can do a pull / do bthe conflict resolution for you :)

---

Reply to this email directly or view it on GitHub:
https://github.com/Pita/etherpad-lite/pull/601#issuecomment-4981134
This email and its attachments may be confidential and are intended solely for the use of the individual to whom it is addressed. Any views or opinions expressed are solely those of the author and do not necessarily represent those of the organisation from which this email originated. If you are not the intended recipient of this email and its attachments, you must take no action based upon them, nor must you copy or show them to anyone. Please contact the sender if you believe you have received this email in error. This email was sent by School Email - Safe Webmail and Hosted Email for Schools

[redhog]

There you go, that should make it auto-mergeable