diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-05-10 22:17:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-10 22:17:28 +0200 |
commit | ffc3f8eebe134ca9b18af73aa29eaa1627082e40 (patch) | |
tree | c85cb56fe22a8172c82346e17d23392a45e0c741 /app/models/account_alias.rb | |
parent | fc8baba8cb26cdcb74f00a4c51c8a88f1ee3e7ac (diff) | |
parent | 7ac8bcf209cd2d72883ee3e5cfa7853620e417da (diff) |
Merge pull request #1534 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/account_alias.rb')
0 files changed, 0 insertions, 0 deletions