| .. | 
		
		
			
				
					| com | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | пре 4 година | 
		
			
				
					| application-batch-sit.properties | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | пре 4 година | 
		
			
				
					| application-batch-sit.properties | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | пре 4 година | 
		
			
				
					| application.properties | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | пре 4 година | 
		
			
				
					| logback-spring.xml | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | пре 4 година |