Skip to content
Commit 7eae75b7 authored by mitchelloharawild's avatar mitchelloharawild
Browse files

Merge remote-tracking branch 'refs/remotes/robjhyndman/master' 

Conflicts:
	tests/testthat/test-ggplot.R
parents c793bf17 29db025d
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment