2 Commits

Author	SHA1	Message	Date
LetterJay	ea9b3622fd	Merge branch 'master' into upstream-merge-37476 ... # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.	2018-05-20 23:11:16 -05:00
oranges	e0412f6325	Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code	2018-05-06 16:37:13 -05:00