diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-03-17 19:23:39 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-03-17 19:23:39 +0100 |
| commit | 4e3c68e0256e6aab4bb30f350dac4fc4386cb0b9 (patch) | |
| tree | 00a495e6f4abf68dbb9ecceae729c9e5345c318a /app/javascript/flavours/glitch/features/account_timeline | |
| parent | ac300173f68d2497cccf4e5bf558d95fc6105c96 (diff) | |
| parent | 443d114574ef152f14815afc5c4ed5c977dd9205 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/helpers/accounts_helper.rb`: Upstream fixed an issue that glitch-soc did not have, in a place with glitch-soc changes to hide the number of followers. Kept glitch-soc's code.
Diffstat (limited to 'app/javascript/flavours/glitch/features/account_timeline')
0 files changed, 0 insertions, 0 deletions