]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Sat, 7 Nov 2020 17:19:34 +0000 (18:19 +0100)
committerThibaut Girka <thib@sitedethib.com>
Sat, 7 Nov 2020 17:23:02 +0000 (18:23 +0100)
commit412218af2ecd4cd004708d781e574208742dea4c
treec0bf823109c7481ec9242a0263e091ec4aaeafeb
parent5a9fc749c3eab8d3c93dd282fa89c20a5cb0e994
parentee8cf246cfe8e05914ad7dcf81596f8535b3e161
Merge branch 'master' into glitch-soc/merge-upstream
17 files changed:
Gemfile.lock
app/lib/activitypub/activity/create.rb
app/models/account.rb
app/serializers/activitypub/note_serializer.rb
app/serializers/rest/status_serializer.rb
app/views/home/index.html.haml
app/views/layouts/_theme.html.haml
app/views/layouts/application.html.haml
app/views/layouts/embedded.html.haml
app/views/layouts/error.html.haml
app/views/media/player.html.haml
app/views/statuses/_simple_status.html.haml
config/routes.rb
config/webpack/shared.js
db/schema.rb
package.json
yarn.lock