Commit Graph

8 Commits

Author SHA1 Message Date
Tom Warren 234aea37d6 Fix conflict 2016-06-03 10:33:45 -04:00
Tom Warren 90a682863a Merge remote-tracking branch 'origin/master'
# Conflicts:
#	62-2PE/02.usfm
2016-06-03 10:32:50 -04:00
Tom Warren f7eb1745ad Adding a space to see if this fixes it 2016-06-03 10:31:52 -04:00
hharrissWA 544070286e long sentence edit 2016-06-02 15:25:27 -06:00
BramvandenHeuvel 1663c498a2 V15 son of 2016-05-18 11:38:02 -04:00
Tom Warren b4c99a2d49 2 Pe 2:7-9 reworked for clarity 2016-04-05 16:11:44 -04:00
Tom Warren 1fbdeaf7e9 Repaired 2 Pet 2:6-7 2016-04-05 15:00:40 -04:00
Richard Mahn 730a56d999 Initial commit from Etherpad 2016-04-01 21:07:38 +00:00