| .. | 
			
		
		
			
				
					| 
						
							
						
						com
					 | 
				
				
					d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts.
				 | 
				4 anos atrás | 
			
		
			
				
					| 
						
							
						
						application-service-dev.properties
					 | 
				
				
					d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts.
				 | 
				4 anos atrás | 
			
		
			
				
					| 
						
							
						
						application-service-sit.properties
					 | 
				
				
					d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts.
				 | 
				4 anos atrás | 
			
		
			
				
					| 
						
							
						
						application.properties
					 | 
				
				
					d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts.
				 | 
				4 anos atrás | 
			
		
			
				
					| 
						
							
						
						logback-spring.xml
					 | 
				
				
					d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts.
				 | 
				4 anos atrás |