diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-01-11 11:55:42 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-01-11 11:55:42 +0100 |
| commit | 33d30632fb627ba1742eff3e0c5fc84ccd156cdb (patch) | |
| tree | b7c15bb354c9d2f0ef25c50ab387007703f599d6 /config/locales/devise.mk.yml | |
| parent | d42e7e01dcd464f80637682d4eee6e5a7f36f26e (diff) | |
| parent | 11d603101a7b3389c679b8c155a3cb06203ca31a (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/models/public_feed.rb`: Upstream refactored a bit, glitch-soc had specific code for local-only statuses. Updated glitch-soc's specific code accordingly.
Diffstat (limited to 'config/locales/devise.mk.yml')
0 files changed, 0 insertions, 0 deletions