diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2020-12-10 09:40:09 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2020-12-10 09:41:49 +0100 |
| commit | 7782e4dc0d9db4835c0f57232da9f8676c97d562 (patch) | |
| tree | f1f1376074bd3ab6aa42624eabfd8d57a30f9c6b /spec/fixtures/salmon/mention.xml | |
| parent | b27d11dd3320cb005561f0bb1b81baecea8a7c43 (diff) | |
| parent | 49eb4d4ddf61e25c5aaab89aa630ddd3c7f3c23d (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/about_controller.rb`: Minor conflict caused by glitch-soc's theming system. Ported upstream changes.
Diffstat (limited to 'spec/fixtures/salmon/mention.xml')
0 files changed, 0 insertions, 0 deletions