1
0
mirror of https://github.com/funamitech/mastodon synced 2024-11-30 07:49:04 +09:00
YuruToot/app
Thibaut Girka 369a475a70 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/serializers/rest/instance_serializer.rb
- app/views/layouts/error.html.haml
- public/oops.png
  Took our version (same as upstream but without the things that only
  make sense in an animation).

Additional changes:
- app/javascript/flavours/vanilla/theme.yml
  Include upstream's javascript in error pages.
2019-02-17 12:26:55 +01:00
..
chewy Improve image description user experience (#10036) 2019-02-14 01:04:43 +01:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-02-17 12:26:55 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-02-15 18:02:45 +01:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2019-02-17 12:26:55 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-02-17 12:26:55 +01:00
mailers Improve e-mail digest (#9689) 2019-01-02 10:47:32 +01:00
models Merge branch 'master' into glitch-soc/merge-upstream 2019-02-15 18:02:45 +01:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2019-01-10 21:00:30 +01:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2018-11-29 19:22:52 +01:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2019-02-17 12:26:55 +01:00
services Merge branch 'master' into glitch-soc/merge-upstream 2019-02-15 18:02:45 +01:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2019-02-12 20:32:48 +01:00
views Merge branch 'master' into glitch-soc/merge-upstream 2019-02-17 12:26:55 +01:00
workers Filter incoming Create activities by relation to local activity (#10005) 2019-02-13 18:42:47 +01:00