mastodon/app
David Yip 54148b9a4a
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
	app/controllers/authorize_follows_controller.rb
	app/javascript/styles/mastodon/components.scss
2018-01-02 00:11:41 -06:00
..
controllers Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-02 00:11:41 -06:00
helpers Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-31 09:17:15 +00:00
javascript Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-02 00:11:41 -06:00
lib Merge remote-tracking branch 'origin/master' into merge-upstream 2017-12-30 17:20:07 -06:00
mailers Using double splat operator (#5859) 2017-12-06 11:41:57 +01:00
models Merge remote-tracking branch 'origin/master' into merge-upstream 2017-12-30 17:20:07 -06: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 2017-12-15 01:17:12 +00:00
services Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-22 04:17:14 +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-02 00:11:41 -06:00
workers Lists redis clean-up (#5886) 2017-12-05 23:20:27 +01:00