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.

imncls bb6988a7ac Merge branch 'master' of https://github.com/tootsuite/mastodon ... # Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb		7 years ago
..
activitypub	Revert #5772 (#6221)	7 years ago
admin	Add moderation note (#5240)	7 years ago
api	Merge branch 'master' of https://github.com/tootsuite/mastodon	7 years ago
auth	Fix email confirmation link not updating email (#6187)	7 years ago
concerns	Fix regeneration marker not expiring (#6290)	7 years ago
oauth	…
settings	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
well_known	…
about_controller_spec.rb	…
account_follow_controller_spec.rb	…
account_unfollow_controller_spec.rb	…
accounts_controller_spec.rb	Rewrite account_controller_spec (#5633)	7 years ago
application_controller_spec.rb	Fix force_ssl conditional (#6201)	7 years ago
authorize_follows_controller_spec.rb	Rename ResolveRemoteAccountService to ResolveAccountService (#6327)	7 years ago
follower_accounts_controller_spec.rb	…
following_accounts_controller_spec.rb	…
home_controller_spec.rb	When web UI URL used while logged out, redirect to static page (#4954)	7 years ago
manifests_controller_spec.rb	Make Chrome splash screen same color as web UI's background color (#5169)	7 years ago
media_controller_spec.rb	…
remote_follow_controller_spec.rb	…
statuses_controller_spec.rb	…
stream_entries_controller_spec.rb	…
tags_controller_spec.rb	Redesign public hashtag pages (#5237)	7 years ago