Skip to content
Snippets Groups Projects
Commit ae1d96cb authored by Alvaro Cabrera's avatar Alvaro Cabrera
Browse files

Merge remote-tracking branch 'origin/develop' into develop 

Conflicts:
	CHANGELOG.md
	package.json
parents 8f789dd6 1a9a7ffc
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 17 additions and 2 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment