Merge branch 'master' of https://github.com/ropensci/plotly into carson-travis-native

Author: cpsievert

.push_test_table.sh

@@ -38,6 +38,7 @@ git checkout gh-pages
 
 mv ../code_commits.csv .
 cat code_commits.csv
+touch table.R
 make
 
 # add, commit, push to gh-pages branch of plotly-test-table

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: plotly
 Type: Package
 Title: Interactive, publication-quality graphs online.
-Version: 0.5.22
+Version: 0.5.24
 Authors@R: c(person("Chris", "Parmer", role = c("aut", "cre"),
     email = "[email protected]"),
     person("Scott", "Chamberlain", role = "aut",
@@ -13,7 +13,9 @@ Authors@R: c(person("Chris", "Parmer", role = c("aut", "cre"),
     person("Marianne", "Corvellec", role="aut",
     email="[email protected]"),
     person("Pedro", "Despouy", role="aut",
-    email="[email protected]"))
+    email="[email protected]"),
+    person("Carson", "Sievert", role="aut",
+    email="[email protected]"))
 Author: Chris Parmer
 Maintainer: Marianne Corvellec <[email protected]>
 License: MIT + file LICENSE

NAMESPACE

@@ -1,4 +1,4 @@
-# Generated by roxygen2 (4.0.2): do not edit by hand
+# Generated by roxygen2 (4.1.0): do not edit by hand
 
 export(gg2list)
 export(ggplot_build2)

NEWS

@@ -1,3 +1,11 @@
+0.5.24 -- 10 March 2015
+
+Implemented #167
+
+0.5.23 -- 10 March 2015.
+
+geom_ribbon now respects alpha transparency
+
 0.5.22 -- 2 March 2015.
 
 Fixes for ylim() #171.