Skip to content
Snippets Groups Projects
Commit b397a7d2 authored by Iustin Pop's avatar Iustin Pop
Browse files

Merge branch 'next' into branch-2.1 

Conflicts:
	lib/backend.py: non-trivial conflict but easy to solve
parents 25f9901f 360b0dc2
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 32 additions and 15 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