4 commits

Author	SHA1	Message	Date
SALLEYRON Julien	1b4dc3783c	Oxy with fixes on websocket + integration tests	2017-08-01 15:24:08 +02:00
Emile Vauge	aeb17182b4	Merge v1.2.1-master ... Signed-off-by: Emile Vauge <emile@vauge.com>	2017-04-11 22:36:56 +02:00
Timo Reimann	e375ba98f0	Update vendored dependencies.	2017-04-03 18:36:23 +02:00
Timo Reimann	dd5e3fba01	Vendor main dependencies.	2017-03-09 13:13:02 +01:00