Skip to content
GitLab
Commit 436d3fac authored by Roger A. Light's avatar Roger A. Light
Browse files

Merge branch 'fixes' into develop 

Conflicts:
	CMakeLists.txt
	ChangeLog.txt
	config.mk
	installer/mosquitto.nsi
	installer/mosquitto64.nsi
	lib/mosquitto.c
	lib/mosquitto.h
	src/loop.c
parents 66924cd8 ed97a3b2
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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