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 fcce135d27 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/settings_controller.rb - app/models/form/admin_settings.rb Conflicts caused by upstream refactoring, while we have flavours and skins, with the flavour_and_skin pseudo-setting.		6 years ago
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
features	…
fixtures	…
helpers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
lib	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mailers	…
models	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
policies	…
presenters	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
requests	Redesign landing page (#10232)	6 years ago
routing	…
serializers/activitypub	Improved remote thread fetching (#10106)	6 years ago
services	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
support	…
validators	…
views	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
workers	Improved remote thread fetching (#10106)	6 years ago
rails_helper.rb	…
spec_helper.rb	…