You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Yip 2ca965c704 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss		8 years ago
..
activitypub	Revert #5772 (#6221)	8 years ago
admin	Add moderation note (#5240)	9 years ago
api	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	8 years ago
auth	Fix email confirmation link not updating email (#6187)	8 years ago
concerns	Fix regeneration marker not expiring (#6290)	8 years ago
oauth	…
settings	Thank you, Officer Murphy	8 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)	8 years ago
application_controller_spec.rb	Fix force_ssl conditional (#6201)	8 years ago
authorize_follows_controller_spec.rb	…
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)	9 years ago
manifests_controller_spec.rb	Make Chrome splash screen same color as web UI's background color (#5169)	9 years ago
media_controller_spec.rb	…
remote_follow_controller_spec.rb	rescue HTTP::ConnectionError in RemoteFollowController#create (#4726)	9 years ago
statuses_controller_spec.rb	Fetch reblogs as Announce activity instead of Note object (#4672)	9 years ago
stream_entries_controller_spec.rb	Update status embeds (#4742)	9 years ago
tags_controller_spec.rb	Redesign public hashtag pages (#5237)	9 years ago