Commit Graph

11 Commits

Author SHA1 Message Date
Tom Warren 203059189b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	63-1JN/05.usfm
2016-06-01 08:36:45 -04:00
Tom Warren 6b7b69ec16 Rework 5:15 2016-06-01 08:33:22 -04:00
Henry Whitney d36a84874d confidence 1jn 5:14 2016-06-01 11:35:08 +01:00
Henry Whitney e435ad8a39 activized passive 1jn 5:19 2016-06-01 11:22:31 +01:00
Henry Whitney f4ce4cd08f 1jn 5:18 2016-06-01 10:58:10 +01:00
Henry Whitney 9cc7084ae3 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	63-1JN/05.usfm
2016-06-01 10:39:30 +01:00
Tom Warren 7f5196ed24 reordered 2016-05-31 13:58:48 -04:00
Henry Whitney 0385d7789a Spurious comma 1jn 5 2016-05-31 11:04:29 +01:00
Henry Whitney b38adc1950 Deleted double spaces 1Jn 5 2016-05-31 10:48:34 +01:00
Henry Whitney 6a657a5e09 1Jn delete empty lines 2016-05-27 12:11:13 +01:00
Richard Mahn 78b7b614f7 Initial commit from Etherpad 2016-04-01 21:07:40 +00:00