Skip to content

Commit 9c6aec8

Browse files
timelyportfoliotimelyportfolio
committed
merge master and run webpack
Merge branch 'master' into instance # Conflicts: # inst/www/react-tools/react-tools.js
2 parents ac841bc + d9e4423 commit 9c6aec8

File tree

12 files changed

+1473
-962
lines changed

12 files changed

+1473
-962
lines changed

‎.gitattributes‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/inst/www/react-tools/react-tools.js binary
2+
/inst/www/react-tools/react-tools.js.map binary

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@
55
inst/doc
66
node_modules
77
reactR.Rcheck
8-
reactR_*.tar.gz
8+
reactR_*.tar.gz
9+
*.swp

‎R/meta.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#'@keywords internal
2-
react_version <- function(){'16.7.0'}
2+
react_version <- function(){'16.8.1'}
33
babel_version <- function(){'6.26.0'}

‎inst/www/react-tools/react-tools.js‎

Lines changed: 219 additions & 111 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)