]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Wed, 13 May 2020 20:11:49 +0000 (22:11 +0200)
committerThibaut Girka <thib@sitedethib.com>
Wed, 13 May 2020 20:11:49 +0000 (22:11 +0200)
commit3baacf6993581ba91e3e3ae0071b25a645d71115
treeec1dbae77aef8bd43e6f5cfef41dfbc72f133ca3
parent559214c33fc0c5b5ee621eb2719fa1a15ac9da95
parent92f85bea528c5eca97a2f075c53f7dcafdf5cb41
Merge branch 'master' into glitch-soc/merge-upstream
12 files changed:
Gemfile
Gemfile.lock
app/javascript/mastodon/features/compose/components/poll_form.js
app/services/batched_remove_status_service.rb
app/services/fan_out_on_write_service.rb
app/services/remove_status_service.rb
app/views/directories/index.html.haml
app/views/statuses/_simple_status.html.haml
config/locales/en.yml
db/schema.rb
package.json
yarn.lock