7 Commits

Author	SHA1	Message	Date
Tom Warren	e7763e2a19	Fixed conflicts	2016-05-24 10:45:16 -04:00
Tom Warren	5f96f956c3	Merge remote-tracking branch 'origin/master' ... # Conflicts: # 65-3JN/01.usfm	2016-05-23 11:18:04 -04:00
Tom Warren	1bf76c9480	Tweeking	2016-05-23 10:25:28 -04:00
Tom Warren	0058ca7c51	Vs 6 in a manner	2016-05-23 09:52:14 -04:00
hmw3	cbeb2262da	3Jn 1:11 added missing clause	2016-05-23 13:57:28 +01:00
hmw3	f9b1434eea	3Jn Extra Spaces	2016-05-23 13:57:28 +01:00
Richard Mahn	78b7b614f7	Initial commit from Etherpad	2016-04-01 21:07:40 +00:00