Skip to content

Commit 3ad914c

Browse files
authored
Merge branch 'master' into translate-fragment
2 parents b9f1f00 + 1542a85 commit 3ad914c

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

Diff for: content/community/conferences.md

+6
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,19 @@ June 21, 2019 Chicago, Illinois USA
5252

5353
[Website](https://reactloop.com) - [Twitter](https://twitter.com/ReactLoop)
5454

55+
### Chain React 2019
56+
July 11-12, 2019. Portland, OR, USA.
57+
58+
[Website](https://infinite.red/ChainReactConf)
59+
5560
### React Rally 2019
5661
August 22-23, 2019. Salt Lake City, USA.
5762

5863
[Website](https://www.reactrally.com/) - [Twitter](https://twitter.com/ReactRally) - [Instagram](https://www.instagram.com/reactrally/)
5964

6065
### ComponentsConf 2019 {#componentsconf-2019}
6166
September 6, 2019 in Melbourne, Australia
67+
6268
[Website](https://www.componentsconf.com.au/) - [Twitter](https://twitter.com/componentsconf)
6369

6470
### React Native EU 2019 {#react-native-eu-2019}

Diff for: src/theme.js

+4
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,10 @@ const sharedStyles = {
405405
marginTop: 0,
406406
},
407407
},
408+
409+
'& .gatsby-highlight': {
410+
marginLeft: 0,
411+
},
408412
},
409413

410414
'& .gatsby-highlight + blockquote': {

0 commit comments

Comments
 (0)