mastodon/app/javascript
Claire c3b64f4a84 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
  Removed upstream, while we had a checkbox telling people to check if the
  issue was present upstream. Removed the file as well.
2021-06-30 00:42:52 +02:00
..
core Merge branch 'master' into glitch-soc/merge-upstream 2020-12-15 14:27:06 +01:00
flavours Merge pull request #1555 from ClearlyClaire/glitch-soc/fixes/video-player-crash 2021-06-24 16:00:26 +02:00
fonts Theme: Windows 95 2017-10-26 23:22:48 -07:00
images Merge branch 'master' into glitch-soc/merge-upstream 2020-05-13 22:11:49 +02:00
locales
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2021-06-30 00:42:52 +02:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2020-12-10 09:41:49 +01:00
skins Glitchsoc translation to 'es' language (#1439) 2020-10-19 22:17:29 +02:00
styles Merge branch 'main' into glitch-soc/merge-upstream 2021-06-25 10:44:06 +02:00