]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Fri, 26 Jun 2020 11:02:14 +0000 (13:02 +0200)
committerThibaut Girka <thib@sitedethib.com>
Fri, 26 Jun 2020 11:02:14 +0000 (13:02 +0200)
commita01674fb2b4eb210b300b380899d388b0807999a
treed497e4b75d85ad5e8dd29416775730d29e13f79d
parent8f4aff9b6fe638b26b9d0bf0fe4151c2cc214d6d
parent08cf81f8c1b445eba9972214869c376fe6097efb
Merge branch 'master' into glitch-soc/merge-upstream
15 files changed:
Gemfile
Gemfile.lock
app/helpers/application_helper.rb
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/javascript/styles/mastodon/admin.scss
app/javascript/styles/mastodon/components.scss
app/models/media_attachment.rb
app/views/admin/custom_emojis/index.html.haml
app/views/admin/tags/index.html.haml
app/views/statuses/_simple_status.html.haml
db/schema.rb
package.json
streaming/index.js
yarn.lock