Skip to content

Commit ccda0e9

Browse files
author
danahmadi
committed
Merge remote-tracking branch 'graphql/source' into source
# Conflicts: # site/users/index.html.js
2 parents 49a3d4d + e69baf8 commit ccda0e9

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

site/_core/Site.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ var Site = React.createClass({
7878
<a href="/blog">GraphQL Team Blog</a>
7979
<a href="http://facebook.github.io/graphql/" target="_blank">Read the Spec</a>
8080
<a href="https://github.com/graphql" target="_blank">GitHub</a>
81-
{page && <a href={'https://github.com/graphql/graphql.github.io/edit/source/site/' + page.relPath} target="_blank">&#x270E; Edit this page</a>}
81+
{page && <a href={'https://github.com/graphql/graphql.github.io/edit/source/site/' + page.relPath} target="_blank">Edit this page &#x270E;</a>}
8282
</div>
8383
</section>
8484
<a href="https://code.facebook.com/projects/" target="_blank" className="fbOpenSource">

site/users/index.html.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,21 @@ var logos = [
3434
link: 'https://www.intuit.com/'
3535
},
3636
{
37-
name: 'Coursea',
37+
name: 'Coursera',
3838
img: 'coursera.png',
3939
link: 'https://www.coursera.org/'
4040
},
4141
{
4242
name: 'Hudl',
4343
img: 'hudl.png',
4444
link: 'https://www.hudl.com/'
45+
},
46+
name: 'Reindex',
47+
img: 'reindex.png',
48+
link: 'https://www.reindex.io/'
4549
},
4650
{
51+
4752
name: 'Meteor',
4853
img: 'meteor.png',
4954
link: 'https://medium.com/apollo-stack/snappier-uis-with-apollo-client-graphql-bffab0b52b79#.sls7hdvud'

site/users/logos/reindex.png

23.1 KB
Loading

0 commit comments

Comments
 (0)