Skip to content
Snippets Groups Projects
Commit b93519d7 authored by Eterevskiy Georgiy's avatar Eterevskiy Georgiy
Browse files

Merge branch 'master' into 'feature/AUTO-1518_view-collections' 

# Conflicts:
#   setup.py
parents 4104f988 678edbcd
No related branches found
No related tags found
This commit is part of merge request !52. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
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