Matthew 0858f17759 Merge branch 'dev'		2021-03-23 20:58:41 -04:00
.gitlab/issue_templates	Resolve merge conflicts	2021-03-19 21:23:38 -04:00
src	more merge conflict fixes	2021-03-23 20:58:15 -04:00
types	Resolve merge conflicts	2021-03-19 21:23:38 -04:00
.eslintrc.json	Resolve merge conflicts	2021-03-19 21:23:38 -04:00
.gitignore	Resolve merge conflicts	2021-03-19 21:23:38 -04:00
.gitlab-ci.yml	Resolve merge conflicts	2021-03-19 21:23:38 -04:00
CONTRIBUTING.md	Resolve merge conflicts	2021-03-19 21:23:38 -04:00
LICENSE	Resolve merge conflicts	2021-03-19 21:23:38 -04:00
Makefile	Resolve merge conflicts	2021-03-19 21:23:38 -04:00
package-lock.json	Set nickname command	2021-02-10 00:24:25 -04:00
package.json	Resolve merge conflicts	2021-03-19 21:23:38 -04:00
tsconfig.json	Resolve merge conflicts	2021-03-19 21:23:38 -04:00
yarn.lock	Resolve merge conflicts	2021-03-19 21:23:38 -04:00