Commit Graph

34 Commits

Author SHA1 Message Date
Tom Warren d855c2022a Merge remote-tracking branch 'origin/master'
# Conflicts:
#	42-MRK/05.usfm
2016-06-22 00:22:14 -04:00
Tom Warren 7d9b841d1d changes 2016-06-22 00:21:26 -04:00
pohlig f23f63fee0 Update 05.usfm 2016-06-20 09:57:14 -04:00
pohlig 51f1ac8080 Update 05.usfm 2016-06-20 09:55:14 -04:00
pohlig e2749e5cd6 Update 05.usfm 2016-06-20 09:54:20 -04:00
pohlig f1f3c9d7a0 Update 05.usfm 2016-06-20 09:41:40 -04:00
pohlig 1e96c67d5e Update 05.usfm 2016-06-20 09:21:52 -04:00
hharrissWA cdcb41bc34 test 2016-06-17 09:03:15 -06:00
hharrissWA 8a52e8c9a7 An "immediately" was removed 2016-06-17 09:01:06 -06:00
Tom Warren 29992a5a69 Jairus
same but found "Jarius" and fixed them.
2016-06-13 16:31:53 -04:00
Tom Warren 9a256bbeb1 smart quote removed 2016-06-07 10:21:15 -04:00
hharrissWA 6374011888 comma to set off a descriptive phrase 2016-06-06 15:05:34 -06:00
Tom Warren a03ae654a3 From the tombs 2016-06-06 07:14:12 -04:00
Tom Warren aa890b3242 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	42-MRK/05.usfm
2016-06-06 06:50:56 -04:00
Tom Warren 78c8d4d9eb Chains and shackles 2016-06-06 06:44:31 -04:00
BramvandenHeuvel e60bcab62f V40-42 rewrite 2016-05-31 14:20:22 -04:00
BramvandenHeuvel 4ea12f6aab V36-38 rewrite 2016-05-31 13:36:19 -04:00
BramvandenHeuvel 0b709dd701 V35 rewrite 2016-05-31 12:41:01 -04:00
BramvandenHeuvel bdcd77b4d2 V33, 34 rewrite 2016-05-31 12:13:38 -04:00
BramvandenHeuvel 380f04d5b6 v30 rewrite 2016-05-31 11:55:54 -04:00
BramvandenHeuvel 0d74c13ef4 V25, 26 rewrite 2016-05-31 11:14:59 -04:00
BramvandenHeuvel 9f73ea559e V22 adjusting 2016-05-27 17:04:54 -04:00
BramvandenHeuvel 7921c57adf v21 wordorder 2016-05-27 17:04:06 -04:00
BramvandenHeuvel a4e93a43f6 V21-24 rewrite 2016-05-27 17:02:26 -04:00
BramvandenHeuvel caa0a90f91 V18-20 rewrite 2016-05-27 13:19:56 -04:00
BramvandenHeuvel 67c89eabf0 V16, 17 rewrite 2016-05-27 11:38:18 -04:00
BramvandenHeuvel f556917afe V16, 17 rewrite 2016-05-26 18:36:26 -04:00
BramvandenHeuvel 9e75aeb77f V14-15 rewrite 2016-05-26 17:00:33 -04:00
BramvandenHeuvel 00918adc17 v11-13 rewrite 2016-05-26 15:39:58 -04:00
BramvandenHeuvel 8dfd4ab235 V9 rewrite 2016-05-26 15:08:17 -04:00
BramvandenHeuvel 025781e594 V8 update 2016-05-26 15:05:05 -04:00
BramvandenHeuvel c04b7ab906 V4 comma deleted 2016-05-26 14:27:12 -04:00
BramvandenHeuvel 48697a79fb V1, 2 rewrite 2016-05-26 14:13:27 -04:00
Richard Mahn 730a56d999 Initial commit from Etherpad 2016-04-01 21:07:38 +00:00