Merge remote-tracking branch 'origin/master' into gitignore

This commit is contained in:
Lynn Cyrin 2019-10-20 13:19:24 -07:00
commit e76377ffec
No known key found for this signature in database
GPG Key ID: EE9CCB427DFEC897
2 changed files with 8 additions and 2 deletions

View File

@ -48,7 +48,7 @@
<li class="subterm">South</li>
<li class="subterm">Southeast</li>
<li>asexual</li>
<li>Auto Immune Disorder (AIDS)</li>
<li>Acquired Immune Deficiency Syndrome (AIDS)</li>
<li>assigned at birth</li>
<li>Attraction</li>
<li class="subterm">Aesthetic</li>
@ -68,6 +68,7 @@
<li>Brown</li>
<li>Bropropriating</li>
<li>Burka</li>
<li>Child of a Deaf Adult (CODA)</li>
<li>cisgender</li>
<li>Climate change</li>
<li>Colonial narrative</li>
@ -81,6 +82,7 @@
<li class="subterm">-girl</li>
<li class="subterm">-romantic</li>
<li class="subterm">-sexual</li>
<li>deaf and Deaf</li>
<li>Disability</li>
<li>disabled</li>
<li>discordant couples</li>
@ -114,6 +116,7 @@
<li>Governmentality</li>
<li>gray ace</li>
<li>Gray asexuality</li>
<li>Hard of Hearing (HOH)</li>
<li>hegemonic</li>
<li>Hermaphrodite</li>
<li class="subterm">pseudo, male and female</li>

View File

@ -38,7 +38,7 @@ Future phases will include definitions and resources.<br><br>
<li class="subterm">South</li>
<li class="subterm">Southeast</li>
<li>asexual</li>
<li>Auto Immune Disorder (AIDS)</li>
<li>Acquired Immune Deficiency Syndrome (AIDS)</li>
<li>assigned at birth</li>
<li>Attraction</li>
<li class="subterm">Aesthetic</li>
@ -58,6 +58,7 @@ Future phases will include definitions and resources.<br><br>
<li>Brown</li>
<li>Bropropriating</li>
<li>Burka</li>
<li>Child of a Deaf Adult (CODA)</li>
<li>cisgender</li>
<li>Climate change</li>
<li>Colonial narrative</li>
@ -70,6 +71,7 @@ Future phases will include definitions and resources.<br><br>
<li class="subterm">-girl</li>
<li class="subterm">-romantic</li>
<li class="subterm">-sexual</li>
<li>deaf and Deaf</li>
<li>Disability</li>
<li>disabled</li>
<li>discordant couples</li>
@ -103,6 +105,7 @@ Future phases will include definitions and resources.<br><br>
<li>Governmentality</li>
<li>gray ace</li>
<li>Gray asexuality</li>
<li>Hard of Hearing (HOH)</li>
<li>hegemonic</li>
<li>Hermaphrodite</li>
<li class="subterm">pseudo, male and female</li>