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.

David Yip 16d5217502 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json		7 years ago
..
about	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
accounts	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
admin	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
admin_mailer	…
application	…
auth	Add headings to the security settings page (#6661)	7 years ago
authorize_follows	Note if the user is already following the target when authorizing follow (#6325)	7 years ago
errors	…
follower_accounts	Add missing meta description to profiles, some other SEO stuff (#6706)	7 years ago
following_accounts	Add missing meta description to profiles, some other SEO stuff (#6706)	7 years ago
home	Finalized theme loading and stuff	7 years ago
invites	Able to deactivate invites if they aren't expired (#7163)	7 years ago
kaminari	…
layouts	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
media	Save video metadata and improve video OpenGraph tags (#6481)	7 years ago
notification_mailer	Display content warning in mail notification emails (#6832)	7 years ago
oauth	…
remote_follow	…
remote_unfollows	Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)	7 years ago
settings	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
shared	…
shares	…
stream_entries	Merge remote-tracking branch 'tootsuite/master'	7 years ago
tags	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
user_mailer	Fix e-mail changed notification (fixes #6778) (#6835)	7 years ago
well_known	…