factor

Author	SHA1	Message	Date
Doug Coleman	b644ec6818	Merge remote-tracking branch 'origin/master' into modern-harvey4	2020-04-02 20:24:16 -05:00
John Benediktsson	de3b74d1c6	basis/extra: move fewer things.	2020-04-01 21:37:28 -07:00
John Benediktsson	42cf41e616	Revert "basis: Move any vocabularies required by basis into basis." This reverts commit `59c2956570`.	2020-04-01 21:37:28 -07:00
Doug Coleman	59c2956570	basis: Move any vocabularies required by basis into basis.	2020-03-28 09:30:37 -05:00