You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 246c313d45 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.		6 years ago
..
extend.rb	Refactor Setting (#3302)	8 years ago
scoped_settings.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago