diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-09-22 17:27:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-22 17:27:15 +0200 |
| commit | 4b7e43602691193b5d2a8e7e0ed6044bc8ee9774 (patch) | |
| tree | 87bd664e538b02ed5d8a916cbd34e7891349bec6 /app/controllers/settings/aliases_controller.rb | |
| parent | 3d05ebfdc3524cff9f01b760176e175e73b55875 (diff) | |
| parent | 7c25251a3958c67f623953c879649dbe616c66c4 (diff) | |
Merge pull request #1606 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/settings/aliases_controller.rb')
0 files changed, 0 insertions, 0 deletions