David Yip 991371af5f Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: db/schema.rb		2018-01-09 14:16:45 -06:00
..
controllers	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-09 05:17:13 +00:00
helpers	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-08 04:17:11 +00:00
javascript	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-09 12:17:16 +00:00
lib	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-09 14:16:45 -06:00
mailers	Add confirmation step for email changes (#6071)	2018-01-02 16:55:00 +01:00
models	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-08 10:17:15 +00:00
policies	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-02 14:17:11 +00:00
presenters	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-06 20:17:13 +00:00
serializers	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-08 10:17:15 +00:00
services	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-08 04:17:11 +00:00
validators	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	2017-12-12 02:54:13 -06:00
views	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-09 14:16:45 -06:00
workers	Fix PuSH workers (#6200)	2018-01-05 23:04:35 +01:00