David Yip 1253279feb Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/settings/two_factor_authentication/confirmations_controller.rb		2018-01-21 13:36:10 -06:00
..
controllers	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-21 13:36:10 -06:00
fabricators	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	2017-12-12 02:54:13 -06:00
features	…
fixtures	Fix XML oEmbed support discovery (#6104)	2017-12-27 03:29:49 +01:00
helpers	…
lib	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-08 10:17:15 +00:00
mailers	Make text e-mails consistent with HTML ones in UserMailer (#6291)	2018-01-20 01:32:05 +01:00
models	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-08 10:17:15 +00:00
policies	…
presenters	Add tests for AccountRelationshipsPresenter (#5805)	2017-11-24 14:41:04 +01:00
requests	…
routing	…
services	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-18 09:17:58 -06:00
support	…
validators	…
views	…
workers	…
rails_helper.rb	Fix force_ssl conditional (#6201)	2018-01-07 15:19:23 +01:00
spec_helper.rb	…