Merge branch 'develop' into develop

This commit is contained in:
Morgan Astra 2018-11-14 00:55:08 -08:00 committed by GitHub
commit 086dccaa36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions

View File

@ -27,7 +27,7 @@ they | them | their | theirs | themselves
If you edit it with a text editor, make sure your editor inputs real If you edit it with a text editor, make sure your editor inputs real
tab characters in that file (a thing your editor might normally be tab characters in that file (a thing your editor might normally be
configured not to do!) In Emacs, you can input real tabs by doing configured not to do!) In Emacs, you can input real tabs by doing
Ctrl+q <tab> Ctrl+q <tab>. In Vi you can use Ctrl+v <tab>.
[pronoun-database]: resources/pronouns.tab [pronoun-database]: resources/pronouns.tab

View File

@ -32,4 +32,9 @@ kit kit kits kits kitself
ne nem nir nirs nemself ne nem nir nirs nemself
fey feym feir feirs feirself fey feym feir feirs feirself
xie xer xer xers xerself xie xer xer xers xerself
ae aer aer aers aerself vi ver ver vers verself
vi vim vir virs vimself
vi vim vim vims vimself
yo yo yos yos yosself
shi hir hir hirs hirself
ae aer aer aers aerself