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 41a98b6543 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/helpers/statuses_helper.rb Upstream moved account helpers to their own file, we had extra helpers there, moved too. - app/lib/sanitize_config.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - config/locales/simple_form.en.yml - spec/lib/sanitize_config_spec.rb		5 years ago
..
controllers	…
fabricators	…
features	…
fixtures	…
helpers	…
lib	…
mailers	…
models	…
policies	…
presenters	…
requests	…
routing	…
serializers/activitypub	…
services	…
support	…
validators	…
views	…
workers	…
rails_helper.rb	…
spec_helper.rb	…