Igor Kulikov 2fb9b74bae Fix conflicts

2024-02-12 14:30:38 +02:00

..

actor

Update license header to 2024 year.

2024-01-09 10:46:16 +02:00

cache

Fix DefaultRateLimitService init

2024-01-26 16:06:50 +02:00

cluster-api

Fix conflicts

2024-02-12 14:30:38 +02:00

coap-server

Update license header to 2024 year.

2024-01-09 10:46:16 +02:00

dao-api

merged with master

2024-01-31 13:27:32 +02:00

data

Merge pull request #10021 from AndriiLandiak/feature/edge-enable-notification-system

2024-02-08 14:04:08 +02:00

edge-api

Introduce edge support for alarm comment

2024-01-10 10:19:07 +02:00

message

Update license header to 2024 year.

2024-01-09 10:46:16 +02:00

proto

Fix conflicts

2024-02-12 14:30:38 +02:00

queue

Fix conflicts

2024-02-12 14:30:38 +02:00

script

Update license header to 2024 year.

2024-01-09 10:46:16 +02:00

stats

Update license header to 2024 year.

2024-01-09 10:46:16 +02:00

transport

Fix conflicts

2024-02-12 14:30:38 +02:00

util

Update license header to 2024 year.

2024-01-09 10:46:16 +02:00

version-control

Merge pull request #10102 from thingsboard/hotfix/3.6.2

2024-01-31 13:15:34 +02:00

pom.xml

Update license header to 2024 year.

2024-01-09 10:46:16 +02:00