Merge remote-tracking branch 'origin/develop/1.2.2' into develop/1.2.2 · thingsboard/thingsboard-gateway@ab82a7d · GitHub

Commit

Merge remote-tracking branch 'origin/develop/1.2.2' into develop/1.2.2

Browse files

# Conflicts:
#	src/main/java/org/thingsboard/gateway/service/MqttMessageReceiver.java
#	src/main/java/org/thingsboard/gateway/service/MqttMessageSender.java

Loading branch information

mp-loki committed Apr 17, 2018

2 parents 2af34db + b8ca1d1 commit ab82a7d