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 20d01a954e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb Conflicts due to the addition of a new preference upstream, “advanced layout”.		6 years ago
..
components	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
containers	fix `isSubmitting` prop case (#10785)	6 years ago
util	…
index.js	Add `forceSingleColumn` prop to `<UI />` (#10807)	6 years ago