8 Commits

Author	SHA1	Message	Date
Tom Warren	3a083681b4	Fix conflict	2016-08-08 15:26:21 -04:00
Tom Warren	953a3fe61d	Merge remote-tracking branch 'origin/master' ... # Conflicts: # 01-GEN/32.usfm	2016-08-08 15:25:19 -04:00
Tom Warren	c99d3798b7	Rework Gen 32:	2016-08-08 15:23:10 -04:00
Henry Whitney	01654301c0	double spaces	2016-08-08 14:52:12 -04:00
Tom Warren	a4431d7f88	extra you taken out	2016-07-26 15:54:02 -04:00
Tom Warren	af707bc103	space in quotations	2016-06-17 12:33:52 -04:00
Dave Statezni	f3350d2678	ULB_SQ_1 global replace	2016-04-28 21:19:14 -05:00
Richard Mahn	730a56d999	Initial commit from Etherpad	2016-04-01 21:07:38 +00:00