diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-10-10 17:26:08 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-10-10 17:26:08 +0200 |
| commit | 61631f475163c5640a78ff66f0ac6c053cda2f84 (patch) | |
| tree | 78920c924924b76872d420c27a8c62fb1b7f6bb7 /spec/mailers | |
| parent | bc0399d54dde2ad058a8382fc3edbe5506a92985 (diff) | |
| parent | a57ac0723f5918b12838da8373d51706cb461a4e (diff) | |
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
Diffstat (limited to 'spec/mailers')
0 files changed, 0 insertions, 0 deletions