David Yip 89a9d629f7 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: Gemfile.lock		2018-01-15 22:17:48 -06:00
..
controllers	Thank you, Officer Murphy	2018-01-10 12:10:43 -06:00
fabricators	…
features	…
fixtures	…
helpers	…
lib	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-08 10:17:15 +00:00
mailers	HTML e-mails for UserMailer (#6256)	2018-01-16 03:29:11 +01:00
models	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-08 10:17:15 +00:00
policies	…
presenters	…
requests	…
routing	…
services	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-08 04:17:11 +00:00
support	…
validators	…
views	…
workers	…
rails_helper.rb	Fix force_ssl conditional (#6201)	2018-01-07 15:19:23 +01:00
spec_helper.rb	…