Skip to content

Commit 55064d7

Browse files
committed
Squashed commit of the following:
commit 2e38d82e7bd3014a8bb5cab79f662ae9c89f784c Merge: cb45ee5 53528f0 Author: Lee Byron <[email protected]> Date: Thu Sep 15 14:07:48 2016 -0500 Merge branch 'source' of https://github.com/danahmadi/graphql.github.io into danahmadi-source commit 53528f0 Author: danahmadi <[email protected]> Date: Thu Sep 15 11:57:24 2016 -0700 Swap Meteor Link back to Story of how we use GraphQL commit cbdea8a Author: danahmadi <[email protected]> Date: Thu Sep 15 11:56:13 2016 -0700 Removed Apollo Logo, Trimmed whitespace around Meteor Logo commit c0abb74 Author: danahmadi <[email protected]> Date: Thu Sep 15 11:55:02 2016 -0700 Remove Apollo, Add Meteor Link commit 28d5a1f Author: danahmadi <[email protected]> Date: Thu Sep 15 11:54:33 2016 -0700 Added trailing comma, merged branches commit 6f3f63f Author: danahmadi <[email protected]> Date: Thu Sep 15 11:46:54 2016 -0700 Added bracket back in! commit 940c497 Author: danahmadi <[email protected]> Date: Thu Sep 15 11:45:15 2016 -0700 Extra space removed commit ccda0e9 Merge: 49a3d4d e69baf8 Author: danahmadi <[email protected]> Date: Thu Sep 15 11:44:49 2016 -0700 Merge remote-tracking branch 'graphql/source' into source # Conflicts: # site/users/index.html.js commit 49a3d4d Author: danahmadi <[email protected]> Date: Thu Sep 15 11:35:06 2016 -0700 Added Meteor and Apollo to the GraphQL user list commit 79d99f3 Author: danahmadi <[email protected]> Date: Thu Sep 15 11:34:49 2016 -0700 Added logos
1 parent cb45ee5 commit 55064d7

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

site/users/index.html.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@ var logos = [
5454
isRound: true,
5555
link: 'https://www.shopify.com/'
5656
},
57+
{
58+
name: 'Meteor',
59+
img: 'meteor.png',
60+
link: 'https://medium.com/apollo-stack/snappier-uis-with-apollo-client-graphql-bffab0b52b79#.fr92aru2y'
61+
},
5762
];
5863

5964
module.exports = ({ page }) =>

site/users/logos/meteor.png

20.6 KB
Loading

0 commit comments

Comments
 (0)