Skip to content

Commit 841777d

Browse files
reactjs-translation-botreactjs-translation-bot
committed
merging all conflicts
2 parents f2d6bd8 + dea363e commit 841777d

File tree

106 files changed

+288
-105
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+288
-105
lines changed

‎.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
lts/erbium
1+
12.16.1

‎content/blog/2013-10-16-react-v0.5.0.md

Lines changed: 1 addition & 1 deletion

‎content/blog/2016-07-13-mixins-considered-harmful.md

Lines changed: 1 addition & 1 deletion

‎content/blog/2020-02-26-react-v16.13.0.md

Lines changed: 1 addition & 1 deletion

‎content/community/meetups.md

Lines changed: 1 addition & 0 deletions

‎content/docs/components-and-props.md

Lines changed: 4 additions & 0 deletions

‎content/docs/faq-structure.md

Lines changed: 1 addition & 1 deletion

‎content/docs/optimizing-performance.md

Lines changed: 3 additions & 1 deletion

‎content/docs/release-channels.md

Lines changed: 2 additions & 0 deletions

‎flow-typed/gatsby.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/**
2+
* Copyright (c) Facebook, Inc. and its affiliates.
3+
*/
4+
15
declare module 'gatsby' {
26
declare module.exports: any;
37
}

0 commit comments

Comments
 (0)