7de7bf2c72c6434d4efcbe9e446490adce7bb1dd
				
			
			
		
	 Szakalakamaka
		
	
	7de7bf2c72
	
	
	Merge remote-tracking branch 'origin/master'
			Szakalakamaka
		
	
	7de7bf2c72
	
	
	Merge remote-tracking branch 'origin/master'
		
			
			# Conflicts: # src/main/resources/logback.xml
Description
				
					Languages
				
				
								
								
									Java
								
								55.2%
							
						
							
								
								
									JavaScript
								
								24.2%
							
						
							
								
								
									HTML
								
								19.6%
							
						
							
								
								
									Dockerfile
								
								0.9%