]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Thu, 4 Apr 2019 12:53:52 +0000 (14:53 +0200)
committerThibaut Girka <thib@sitedethib.com>
Thu, 4 Apr 2019 12:53:52 +0000 (14:53 +0200)
commit1682ac571763f473da54074b0608cd9ccb4b9ae5
tree2cb3f134660b2d7d460772966f7eb595395611f7
parent3f5acc1ab3bc9c5a6c5805901a393ccd3457b909
parent26bd9fa508ac155f996c2c0d9753a27d46158749
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/following_accounts_controller.rb
  Conflicts were due to glitch-soc's theming system.
- app/javascript/packs/public.js
  Some code has been change upstream, but it has been
  moved to app/javascript/core/settings.js in glitch-soc.
  Applied the changes there.
Gemfile.lock
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
app/javascript/core/settings.js