mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 05:02:25 -05:00 
			
		
		
		
	[frontend] fix conflict introduced by merge (#1007)
This commit is contained in:
		
					parent
					
						
							
								b4f7316a4c
							
						
					
				
			
			
				commit
				
					
						ad08c6c229
					
				
			
		
					 1 changed files with 1 additions and 1 deletions
				
			
		|  | @ -31,7 +31,7 @@ const adminActions = require("../redux/reducers/instances").actions; | |||
| const { | ||||
| 	TextInput, | ||||
| 	TextArea, | ||||
| 	_File | ||||
| 	File | ||||
| } = require("../components/form-fields").formFields(adminActions.setAdminSettingsVal, (state) => state.instances.adminSettings); | ||||
| 
 | ||||
| module.exports = function AdminSettings() { | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue