app/javascript/mastodon/locales/en.json
Upstream added new strings close to ones modified to say "toot".
Added new strings and changed "post" to "toot".
app/models/notification.rb
Upstream added a new relationship close to one added for reactions.
Added new relationship.
app/services/notify_service.rb
Upstream added a new non-email type next to one added for reactions.
Added type as upstream.
config/locales/en.yml
Upstream added new string close to one changed to say "toot".
Added new string.
db/schema.rb
Upstream bumped schema version and added a new table definition where an additional one was.
Applied changes.
:warning: Includes db migrations
Some changes have already been merged in #505
Conflicts:
app/javascript/mastodon/locales/en.jsonUpstream added new strings close to ones modified to say "toot". Added new strings and changed "post" to "toot".app/models/notification.rbUpstream added a new relationship close to one added for reactions. Added new relationship.app/services/notify_service.rbUpstream added a new non-email type next to one added for reactions. Added type as upstream.config/locales/en.ymlUpstream added new string close to one changed to say "toot". Added new string.db/schema.rbUpstream bumped schema version and added a new table definition where an additional one was. Applied changes.Postponed changes:
Ported changes:
Additional changes: