]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Mon, 18 Mar 2019 17:03:27 +0000 (18:03 +0100)
committerThibaut Girka <thib@sitedethib.com>
Mon, 18 Mar 2019 17:03:27 +0000 (18:03 +0100)
commit291012ec0c08f5323b2102eb4d2dc8714ddce4d9
tree09e7a5fef106da1b6ebdc53ac0df62cafc159520
parent6e3a4bcbc70bb33bfb0746cf3b2186ee9f4e6515
parentf85b66eb8cc9513822d0ece3928b12aa789bb410
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/accounts_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/statuses_controller.rb

All conflicts caused by the additional `use_pack` used for glitch-soc's theming
system.
15 files changed:
Gemfile
Gemfile.lock
app/controllers/accounts_controller.rb
app/controllers/application_controller.rb
app/controllers/follower_accounts_controller.rb
app/controllers/relationships_controller.rb
app/controllers/statuses_controller.rb
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json
app/models/status.rb
app/views/relationships/show.html.haml
config/locales/en.yml
config/locales/ja.yml
db/schema.rb