aboutsummaryrefslogtreecommitdiff
path: root/people.json
diff options
context:
space:
mode:
authorBraxton Hall2022-11-17 07:11:16 +0000
committerGitHub2022-11-17 07:11:16 +0000
commitd77304ded560e1a7d467e322b0f280f5df0cb3b6 (patch)
tree5b445fd4cee240977ba9dbbd1c4f599f93621bcf /people.json
parent36ddffec9fc05b0a3c99d30efa4d5b26bbde8c13 (diff)
parentc3ad989c8e7a2636da82e36d68f677c15a270438 (diff)
Merge pull request #84 from themaskedtaquito/main
Mari's fib entry
Diffstat (limited to 'people.json')
-rw-r--r--people.json12
1 files changed, 12 insertions, 0 deletions
diff --git a/people.json b/people.json
index fdfd52d..f1b99d4 100644
--- a/people.json
+++ b/people.json
@@ -676,6 +676,18 @@
]
},
{
+
+ "github": "themaskedtaquito",
+ "name": "Mari Allison",
+ "title": "MASLIS, UBC",
+ "entries": [
+ {
+ "name": "color",
+ "link": "./entries/themaskedtaquito/fib.js"
+ }
+ ]
+ },
+ {
"github": "skairunner",
"name": "Skye Im",
"title": "Software Engineer",