Igor Kulikov 3b55ebe5d4 Fix conflicts

2020-09-09 18:29:06 +03:00

..

actor

Version set to 3.2.0-SNAPSHOT

2020-08-17 18:11:43 +03:00

dao-api

Merge with master

2020-09-07 15:15:41 +03:00

data

Fix conflicts

2020-09-09 18:29:06 +03:00

message

Custom MQTT Topic filters in device profile

2020-09-09 17:26:35 +03:00

queue

Merge with UI changes

2020-09-02 19:10:46 +03:00

stats

Version set to 3.2.0-SNAPSHOT

2020-08-17 18:11:43 +03:00

transport

Custom MQTT Topic filters in device profile

2020-09-09 17:26:35 +03:00

util

Version set to 3.2.0-SNAPSHOT

2020-08-17 18:11:43 +03:00

pom.xml

Restore version 3.1.1-SNAPSHOT

2020-09-01 14:55:41 +03:00