Glitch-Shrike/app
David Yip 4c1fd9a19c
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
Conflicts:
      app/javascript/styles/mastodon/components.scss
2018-02-02 08:39:52 -06:00
..
controllers Merge remote-tracking branch 'tootsuite/master' into merge-upstream 2018-02-02 08:39:52 -06:00
helpers Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-28 22:45:17 -06:00
javascript Merge remote-tracking branch 'tootsuite/master' into merge-upstream 2018-02-02 08:39:52 -06:00
lib Merge remote-tracking branch 'tootsuite/master' into merge-upstream 2018-02-02 08:39:52 -06:00
mailers Add direction tags to HTML e-mails for RTL languages (#6373) 2018-01-29 00:22:20 +01:00
models Merge remote-tracking branch 'tootsuite/master' into merge-upstream 2018-02-02 08:39:52 -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 2018-01-17 16:17:10 +00:00
services Merge remote-tracking branch 'tootsuite/master' into merge-upstream 2018-02-02 08:39:52 -06:00
validators Merge remote-tracking branch 'tootsuite/master' into merge-upstream 2018-02-02 08:39:52 -06:00
views Merge remote-tracking branch 'tootsuite/master' into merge-upstream 2018-02-02 08:39:52 -06:00
workers Rename ResolveRemoteAccountService to ResolveAccountService (#6327) 2018-01-22 14:25:09 +01:00