mirror of
				https://github.com/mastodon/mastodon.git
				synced 2025-10-30 20:51:33 +00:00 
			
		
		
		
	|  246c313d45 Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection. | ||
|---|---|---|
| .. | ||
| extend.rb | ||
| scoped_settings.rb | ||