Commit Graph

10 Commits

Author SHA1 Message Date
Tom Warren b3d38d067e Sync conflict resolved 2016-08-12 08:53:49 -04:00
Tom Warren a313eb3cd2 CLeared for sync
# Conflicts:
#	02-EXO/36.usfm
2016-08-12 08:51:26 -04:00
Tom Warren d245cfed89 craftsmen spoke 2016-08-12 08:49:59 -04:00
Tom Warren 48af5838c5 craftsmen 2016-08-11 18:17:20 -04:00
Tom Warren c483132ca5 craftsmen 2016-08-11 18:07:30 -04:00
Tom Warren e6d29a7ed4 Speaker 2016-08-11 17:26:42 -04:00
Tom Warren edaeb6c30d Chunk divide 2016-08-11 17:24:55 -04:00
Tom Warren 6a65dbf3cb Wise of heart 2016-08-11 17:20:45 -04:00
Tom Warren a6e60f0f5b those who worked on the sacred tent 2016-08-11 17:06:20 -04:00
Richard Mahn 78b7b614f7 Initial commit from Etherpad 2016-04-01 21:07:40 +00:00