1
0
mirror of https://github.com/funamitech/mastodon synced 2024-11-28 14:58:38 +09:00
YuruToot/app/views/admin/settings
Thibaut Girka 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
  conflicts caused by image URLs being different
- app/models/status.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
  some strings were changed upstream
- spec/models/status_spec.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline
2019-10-10 17:26:08 +02:00
..
edit.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2019-10-10 17:26:08 +02:00