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.

Claire e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it.		4 years ago
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
fabricators	…
features	…
fixtures	Add import/export feature for bookmarks (#14956)	4 years ago
helpers	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
lib	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
mailers	…
models	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
policies	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
presenters	…
requests	…
routing	…
serializers/activitypub	…
services	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
support	…
validators	…
views	…
workers	…
rails_helper.rb	…
spec_helper.rb	…