ViacheslavKlimov
		
	
	
		f98eee5407
		
	
	
	
	Merge branch 'develop/3.5.2' into feature/exceeded-rate-limits-notifications
		
			
			# Conflicts:
#	application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
#	application/src/main/resources/thingsboard.yml
#	application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java
#	dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotifications.java
#	ui-ngx/src/app/modules/common/modules-map.ts
		
	
 
		2023-06-13 13:49:51 +03:00
	 
	
	
		 ..
	
	
	
		
			
			
			
			
			
			2023-06-07 15:18:45 +03:00
		 
	
		
			
			
			
			
			
			2023-05-22 16:32:24 +03:00
		 
	
		
			
			
			
			
			
			2023-05-22 17:50:05 +03:00
		 
	
		
			
			
			
			
			
			2023-06-07 15:18:45 +03:00
		 
	
		
			
			
			
			
			
			2023-05-22 16:32:24 +03:00
		 
	
		
			
			
			
			
			
			2023-06-02 15:09:09 +03:00
		 
	
		
			
			
			
			
			
			2023-05-22 16:32:24 +03:00