]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Thu, 28 Mar 2019 12:01:33 +0000 (13:01 +0100)
committerThibaut Girka <thib@sitedethib.com>
Thu, 28 Mar 2019 12:01:33 +0000 (13:01 +0100)
commit050efbc12650feaac3e833c4dd740bf090e3dae1
tree260458c7ff43dd82fc02cc7e5ef0920dd8d2a25b
parent0418bdd71f59b4d7e9f3498f2990c8b044f310e1
parent24d5b6f9e39d2ac62a9657c7d19bc8c437b0735b
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
16 files changed:
Gemfile
Gemfile.lock
app/controllers/relationships_controller.rb
app/helpers/stream_entries_helper.rb
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
app/models/status.rb
app/serializers/rest/status_serializer.rb
app/services/post_status_service.rb
app/views/relationships/show.html.haml
app/views/stream_entries/_simple_status.html.haml
app/workers/activitypub/distribute_poll_update_worker.rb
config/locales/en.yml
config/locales/pl.yml