| .. | 
		
		
			
				
					| complex | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | il y a 4 ans | 
		
			
				
					| condition | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | il y a 4 ans | 
		
			
				
					| generic | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | il y a 4 ans | 
		
			
				
					| variable | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | il y a 4 ans | 
		
			
				
					| AlarmData.class | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | il y a 4 ans | 
		
			
				
					| MeasuringData.class | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | il y a 4 ans | 
		
			
				
					| Protocol.class | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | il y a 4 ans | 
		
			
				
					| ProtocolData.class | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | il y a 4 ans | 
		
			
				
					| RepeateData.class | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | il y a 4 ans | 
		
			
				
					| TypeData.class | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | il y a 4 ans | 
		
			
				
					| VersionData.class | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | il y a 4 ans |