Skip to content
Snippets Groups Projects
Commit 482e1eab authored by Todor Kondic's avatar Todor Kondic
Browse files

Merge branch 'master' into 'dev' 

# Conflicts:
#   DESCRIPTION
#   R/mix.R
parents 269429b1 ced3f0d1
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
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