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 071c2c9c85 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss		7 years ago
..
controllers	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
fabricators	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	7 years ago
features	…
fixtures	Fix XML oEmbed support discovery (#6104)	7 years ago
helpers	…
lib	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
mailers	Make text e-mails consistent with HTML ones in UserMailer (#6291)	7 years ago
models	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
policies	…
presenters	Add tests for AccountRelationshipsPresenter (#5805)	7 years ago
requests	Redesign the landing page, mount public timeline on it (#4122)	8 years ago
routing	…
services	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
support	…
validators	…
views	…
workers	…
rails_helper.rb	Fix force_ssl conditional (#6201)	7 years ago
spec_helper.rb	…