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 c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb		6 years ago
..
admin	Add moderation note (#5240)	7 years ago
settings	Set up /settings/keyword_mutes. #164.	7 years ago
application_helper_spec.rb	Revert Font Awesome 5 upgrade (#8810)	6 years ago
flashes_helper_spec.rb	Spec FlashesHelper (#3414)	7 years ago
home_helper_spec.rb	Fix locale related specs (#3707)	7 years ago
instance_helper_spec.rb	Do not default site_title with site_hostname in InstanceHelper (#6624)	6 years ago
jsonld_helper_spec.rb	Append '.test' to hostname in stub data (#7260)	6 years ago
routing_helper_spec.rb	Use URI.join even when S3 enabled (#4652)	7 years ago
settings_helper_spec.rb	Fix language filter codes (#4841)	7 years ago
stream_entries_helper_spec.rb	Display full acct on public status pages, always (#8011)	6 years ago