]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Tue, 29 Jun 2021 22:42:52 +0000 (00:42 +0200)
committerClaire <claire.github-309c@sitedethib.com>
Tue, 29 Jun 2021 22:42:52 +0000 (00:42 +0200)
commitd1780fb9a4dbf3f458f9634b285294c0d674feb9
tree56a3e393cae7583d0d790227d6dbd4a528021e15
parentff3626269eae9c2d15af4c7f05427c2bfcb065ef
parent7c27ccb8d8fda060f3c5b234f7c81fc29b5fc915
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.
app/javascript/mastodon/initial_state.js
app/serializers/initial_state_serializer.rb
app/views/layouts/public.html.haml