Skip to content

Commit

Permalink
Merge branch 'master' into prepare_release
Browse files Browse the repository at this point in the history 
Conflicts:
	vignettes/scrm-Arguments.Rmd
  • Loading branch information
@paulstaab
paulstaab committed Dec 11, 2016
2 parents fa36e4d + eb539aa commit 42e808c
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 42e808c

Please sign in to comment.