Skip to content
Snippets Groups Projects
Commit cfd3fe0d authored by Piotr Maślanka's avatar Piotr Maślanka
Browse files

Merge branch 'master' into develop 

# Conflicts:
#	CHANGELOG.md
#	coolamqp/uplink/handshake.py
#	setup.cfg
parents e124765b fe2b534a
No related branches found
No related tags found
No related merge requests found
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