Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.
		
			
				
	
	
	
		
			10 KiB
		
	
	
	
	
	
	
	
			
		
		
	
	
			10 KiB
		
	
	
	
	
	
	
	
Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.