| .. | 
		
		
			
				
					| common | 5383c2c971
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 gadi atpakaļ | 
		
			
				
					| config | 5383c2c971
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 gadi atpakaļ | 
		
			
				
					| dao | 5383c2c971
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 gadi atpakaļ | 
		
			
				
					| entity | 5383c2c971
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 gadi atpakaļ | 
		
			
				
					| service | 5383c2c971
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 gadi atpakaļ | 
		
			
				
					| utils | 5383c2c971
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 gadi atpakaļ |