Merge branch 'master' into dev

plotly · Feb 12, 2020 · d7dcae7 · d7dcae7
2 parents 402969d + f81fcb5
commit d7dcae7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Change Log for Dash for R
 All notable changes to this project will be documented in this file.
 
+
 ## [0.3.0] - 2020-02-12
 ### Added
 - Support for config-aware relative paths [#172](https://github.com/plotly/dashR/pull/172)
@@ -43,6 +44,7 @@ All notable changes to this project will be documented in this file.
 - Fixes for hot reloading interval handling and refreshing apps within viewer pane [#148](https://github.com/plotly/dashR/pull/148)
 - `get_asset_url` checks `getAppPath()` as well as `DASH_APP_ROOT_PATH` environment variable when invoked [#161](https://github.com/plotly/dashR/pull/161)
 
+
 ## [0.1.0] - 2019-07-10
 ### Added
 - Initial release

diff --git a/NAMESPACE b/NAMESPACE
@@ -27,4 +27,4 @@ importFrom(routr,RouteStack)
 importFrom(routr,ressource_route)
 importFrom(stats,setNames)
 importFrom(tools,file_ext)
-importFrom(utils,getFromNamespace)
+importFrom(utils,getFromNamespace)
diff --git a/R/dash.R b/R/dash.R
@@ -903,7 +903,6 @@ Dash <- R6::R6Class(
     # ------------------------------------------------------------------------
     run_server = function(host = Sys.getenv('HOST', "127.0.0.1"),
                           port = Sys.getenv('PORT', 8050),
-
                           block = TRUE,
                           showcase = FALSE,
                           use_viewer = FALSE,

diff --git a/R/utils.R b/R/utils.R
@@ -1341,4 +1341,4 @@ validate_keys <- function(string) {
   } else {
     return(string)
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -1341,4 +1341,4 @@ validate_keys <- function(string) { @@
       } else {
         return(string)
       }
-    }
+    }