]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Tue, 5 Mar 2019 18:23:16 +0000 (19:23 +0100)
committerThibaut Girka <thib@sitedethib.com>
Tue, 5 Mar 2019 18:23:16 +0000 (19:23 +0100)
commitf513317ba262d9f5d7aa7dd66f8b61690297e107
tree6732fcf1178fc3e27404c6830bc2bc1c832659ae
parent2a4ce7458a16c64029842fde210089453be2ede1
parent7d5e2dda78414316f9cf09fcf6096d6a158da312
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/models/status.rb
- db/schema.rb

Both conflicts are caused by us having extra database columns.
13 files changed:
Gemfile.lock
app/helpers/stream_entries_helper.rb
app/javascript/styles/mastodon/components.scss
app/models/account.rb
app/models/concerns/account_associations.rb
app/models/status.rb
app/serializers/rest/status_serializer.rb
app/services/post_status_service.rb
app/views/stream_entries/_simple_status.html.haml
config/locales/en.yml
config/routes.rb
db/schema.rb
lib/mastodon/version.rb