4 Commits

Author	SHA1	Message	Date
Tom Warren	bacbb0d130	Merge remote-tracking branch 'origin/master' ... # Conflicts: # 67-REV/15.usfm	2016-07-13 15:52:41 -04:00
Tom Warren	d48db0811a	temple in which was the tent	2016-07-13 15:50:06 -04:00
Tom Warren	fb4056ed95	naos, is temple	2016-07-13 14:45:38 -04:00
Richard Mahn	730a56d999	Initial commit from Etherpad	2016-04-01 21:07:38 +00:00