diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-02-12 10:28:32 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-02-12 10:28:32 +0100 |
| commit | 5e11f3a6e1de864da8a7e694f18eaa3b5e4c7379 (patch) | |
| tree | f0dc221cad560933a921fc2b4d85fad065a7601a /app/services/deliver_to_device_service.rb | |
| parent | a30a40c4379b26890b6453083ef213e672658902 (diff) | |
| parent | 15ced8728ff89932e3f8febf119f63c78ac9a960 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/styles/mastodon/modal.scss`: For some reason we changed the file loading path in glitch-soc, but now upstream has completely changed how the logo is loaded. Applied upstream changes.
Diffstat (limited to 'app/services/deliver_to_device_service.rb')
0 files changed, 0 insertions, 0 deletions