Merge pull request #3647 from emberjs/team-updates

Add chris & amy to the team page
emberjs · Oct 20, 2018 · 50ab830 · 50ab830
2 parents b76f93a + 77c5789
commit 50ab830
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/data/team.yml b/data/team.yml
@@ -187,7 +187,7 @@
   first: Todd
   last: Jordan
   github: https://github.com/toddjordan
-  twitter: https://twitter.com/tddjordan 
+  twitter: https://twitter.com/tddjordan
   image: tjordan.jpg
   teams:
     - learning
@@ -300,3 +300,19 @@
   image: anavasardyan.jpg
   teams:
     - cli
+- name: Amy Lam
+  first: Amy
+  last: Lam
+  github: https://github.com/amyrlam
+  twitter: https://twitter.com/amyrlam
+  image: alam.jpg
+  teams:
+    - learning
+- name: Chris Mason
+  first: Chris
+  last: Mason
+  github: https://github.com/mansona
+  twitter: https://twitter.com/real_ate
+  image: cmason.jpg
+  teams:
+    - learning
diff --git a/source/images/team/alam.jpg b/source/images/team/alam.jpg
diff --git a/source/images/team/cmason.jpg b/source/images/team/cmason.jpg