Oleksandra Matviienko c73fc3e0fc Merge remote-tracking branch 'upstream/develop/3.5' into feature/test_dependency_refactor
# Conflicts:
#	dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceServiceTest.java
#	dao/src/test/java/org/thingsboard/server/dao/service/BaseOtaPackageServiceTest.java
2023-03-14 10:34:46 +01:00
..