Skip to content
Snippets Groups Projects
Commit c30421e0 authored by René Nussbaumer's avatar René Nussbaumer
Browse files

Merge branch 'devel-2.2' 


hansmi helped me with merging the conflict. Thanks

Conflicts:
	lib/workerpool.py

Signed-off-by: default avatarRené Nussbaumer <rn@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parents 14bde528 310a8944
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 626 additions and 50 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