Commit Graph

945 Commits

Author SHA1 Message Date
jbnathan3 f86972d8da clarified line 19 and table at 150 2018-11-14 13:43:12 +00:00
Jesse Griffin a9f25e5953 updates from jbnathan3 2018-11-13 16:37:40 -05:00
jbnathan3 a848c2469c Merge branch 'master' of jbnathan3/en_ugg into master 2018-11-06 02:23:35 +00:00
jbnathan3 ffd597fb55 Update 'content/person_first.rst'
adjusted first table to correct format
2018-11-03 02:19:25 +00:00
cpresson af588be663 Merge branch 'jbnathan3' of unfoldingWord/en_ugg into master 2018-11-02 18:22:47 +00:00
cpresson 783859b635 :wqMerge branch 'master' into jbnathan3 2018-11-02 14:13:01 -04:00
jbnathan3 39009557de Update 'content/person_first.rst' 2018-10-30 14:46:21 +00:00
jbnathan3 6065f6c8ef Update 'content/person_first.rst' 2018-10-30 14:05:53 +00:00
jbnathan3 f1d3474a3a Update 'content/person.rst' 2018-10-24 17:25:04 +00:00
jbnathan3 0b7436a4ff Update 'content/person_first.rst' 2018-10-24 17:23:31 +00:00
jbnathan3 c6623986c2 Update 'content/person.rst' 2018-10-24 17:11:12 +00:00
cpresson 0a6b23086a Merge branch 'master' of jbnathan3/en_ugg into master 2018-10-24 15:04:12 +00:00
jbnathan3 641a72d67f Update 'content/person_first.rst' 2018-10-24 14:19:13 +00:00
jbnathan3 6a12e2de61 Update 'content/person.rst' 2018-10-24 13:35:35 +00:00
cpresson 528771d794 Merge branch 'jbnathan3' of unfoldingWord/en_ugg into master 2018-10-24 13:00:39 +00:00
cpresson 0039aa22f9 Merge branch 'master' into jbnathan3 2018-10-24 08:49:05 -04:00
jbnathan3 968a5e4bd0 Update 'content/person.rst' 2018-10-19 13:57:11 +00:00
jbnathan3 3c156c820c Update 'content/person.rst' 2018-10-17 21:32:51 +00:00
cpresson b7bb86ec49 Merge branch 'master' of cpresson/en_ugg_CP into master 2018-10-17 13:43:37 +00:00
cpresson 32c4c41beb Changes to index/toc 2018-10-17 13:42:58 +00:00
cpresson 28cbfca316 Merge branch 'master' of cpresson/en_ugg_CP into master 2018-10-17 13:06:21 +00:00
cpresson 14a37bb299 Test changes to index/toc 2018-10-17 13:05:50 +00:00
cpresson 8f385a619e Merge branch 'master' of cpresson/en_ugg_CP into master 2018-10-16 20:26:17 +00:00
cpresson 0f405801ee Update 'content/index.rst' 2018-10-16 20:25:44 +00:00
cpresson f56ec695e2 Merge branch 'master' of cpresson/en_ugg_CP into master 2018-10-16 20:20:39 +00:00
cpresson 970ce6e846 Update 'content/index.rst' 2018-10-16 20:19:46 +00:00
cpresson b83e83ac02 Merge branch 'master' of cpresson/en_ugg_CP into master 2018-09-05 17:03:27 +00:00
cpresson 25c4bcdd57 Update 'content/person.rst' 2018-09-05 17:02:47 +00:00
cpresson 82cc552f65 Update 'content/adjective.rst' 2018-09-05 17:02:07 +00:00
cpresson a819dc7de3 Merge branch 'master' of cpresson/en_ugg_CP into master 2018-09-05 16:46:23 +00:00
cpresson 8fd12dee63 Update 'content/person.rst' 2018-09-05 16:45:50 +00:00
cpresson 6eba242c2d Merge branch 'master' of cpresson/en_ugg_CP into master 2018-09-05 15:17:05 +00:00
cpresson 0a991e5b22 Update 'content/person.rst' 2018-09-05 15:15:06 +00:00
cpresson a975a7a0b9 Merge branch 'master' of cpresson/en_ugg_CP into master 2018-08-22 23:30:50 +00:00
cpresson 73146ee780 Added JBNathan's info 2018-08-22 23:30:00 +00:00
cpresson 99dacdb6d9 Updated the glossary content 2018-08-22 23:27:50 +00:00
cpresson e4ffb97146 Updated the glossary content 2018-08-22 23:18:05 +00:00
cpresson 0c1858c600 Merge branch 'testforbuild' of unfoldingWord/en_ugg into master 2018-08-22 21:55:39 +00:00
cpresson 76e01bd13d Update 'content/person_first.rst' 2018-08-22 21:54:49 +00:00
cpresson 92af0c3518 Merge branch 'master' of cpresson/en_ugg_CP into master 2018-08-22 21:48:13 +00:00
cpresson a0edff7997 Update 'content/person_first.rst' 2018-08-22 21:47:05 +00:00
cpresson 0cbd13785f Update 'content/person_first.rst' 2018-08-22 21:34:16 +00:00
cpresson 01946452ad Merge branch 'JBN' of unfoldingWord/en_ugg into master 2018-08-22 00:04:21 +00:00
cpresson 270df9378e Update 'content/person_first.rst' 2018-08-22 00:03:33 +00:00
cpresson 472d38ea24 Merge branch 'JBN1' of unfoldingWord/en_ugg into master 2018-08-21 23:54:17 +00:00
cpresson 7d657a5717 Update 'content/person_first.rst' 2018-08-21 23:49:55 +00:00
cpresson b3dafb6eeb Update 'content/person_first.rst' 2018-08-21 16:34:31 +00:00
cpresson fb064235a4 Merge branch 'testcontent' of cpresson/en_ugg into master 2018-07-16 20:46:39 +00:00
cpresson 77911c7df4 Update 'content/cond.rst' 2018-07-16 20:45:08 +00:00
toddlprice 004e7692c6 Merge branch 'updated_contributors_todd' of unfoldingWord/en_ugg into master 2018-06-06 15:33:52 +00:00