Skip to content
GitLab
Commit 538cfed5 authored by Julia Giner's avatar Julia Giner
Browse files

Merge branch 'master' into develop-AnimVSLTime 

Conflicts:
	deleted  inst/config/IC3.conf
	modified inst/doc/plot_timeseries.R
parents 9fffd491 886501b7
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment