YevhenBondarenko 9f863116a0 Merge branch 'master' of https://github.com/thingsboard/thingsboard into feature/kafka-settings ...

# Conflicts:
#	application/src/main/resources/thingsboard.yml

2021-03-02 10:11:07 +02:00

..

src/main

Merge branch 'master' of https://github.com/thingsboard/thingsboard into feature/kafka-settings

2021-03-02 10:11:07 +02:00

pom.xml

JDK 11 Support

2021-02-04 19:31:20 +02:00