Merge branch 'master' into add-matt-farmer-to-2020-02-06-agenda

m14t · Feb 6, 2020 · 3717cd6 · 3717cd6
2 parents bb02041 + f1dccd7
commit 3717cd6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/agendas/2020-01-09.md b/agendas/2020-01-09.md
@@ -41,13 +41,15 @@ agenda, edit this file.*
 | Liliana Matos            | 1stdibs                  | New York, NY, US
 | Rob Richard              | 1stdibs                  | New York, NY, US
 | Benjie Gillam✏️           | GraphiQL / Graphile      | Southampton, UK
+| Ivan Goncharov           | graphql-js               | Singapore, SG 
 | Usama liaquat✏️           | Gomarry / xPackage Team  | Karachi, Pakistan
 | Praveen Durairaju        | Hasura                   | Bangalore, India
-| Alan Cha                 | IBM Research             | Yorktown Heights, NY, US
+| Morris Matsa             | IBM                      | Boston, US
 | Krithika (Kriti) Prakash | IBM                      | New Jersey, US
 | Erik Wittern             | IBM                      | Hamburg, Germany
 | Matt Farmer              | Individual Contrib       | Oakland, CA, US
 | Mike Marcacci            | Marcacci Labs            | Woodside, CA, US
+| Stephen Spalding✏️        | Netflix                  | Los Gatos, CA, US
 | Vince Foley              | New Relic, Absinthe      | Portland, OR
 | *ADD YOUR NAME ABOVE TO ATTEND*
 

diff --git a/agendas/2020-02-06.md b/agendas/2020-02-06.md
@@ -26,6 +26,11 @@ agenda, edit this file.*
 | ------------------------ | ------------------------ | ------------------------
 | Lee Byron                | GraphQL Foundation       | San Francisco, CA, US
 | Matt Farmer              | Individual Contrib       | Oakland, CA, US
+| Michael Staib            | ChilliCream              | Zurich, CH
+| Rafael Staib             | ChilliCream              | Zurich, CH
+| Alan Cha ✏               | IBM Research             | Yorktown Heights, NY, US
+| Orta Therox              | Microsoft / me           | San Francisco, CA, US
+| Benjie Gillam ✏          | GraphiQL / Graphile      | Southampton, UK
 | *ADD YOUR NAME ABOVE TO ATTEND*
 
 
@@ -60,4 +65,5 @@ Example agenda item:
    - [Custom Scalar Specification URIs RFC Issue](https://github.com/graphql/graphql-spec/issues/635)
    - [Custom Scalar Specification URIs RFC PR](https://github.com/graphql/graphql-spec/pull/649)
    - [GraphQL.js PR](https://github.com/graphql/graphql-js/pull/2276/files)
+1.  I'd like to get an idea of what people want from the website redesign (10m, Orta)
 1. *ADD YOUR AGENDA ABOVE*