]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Mon, 20 Jan 2020 17:31:11 +0000 (18:31 +0100)
committerThibaut Girka <thib@sitedethib.com>
Mon, 20 Jan 2020 17:31:11 +0000 (18:31 +0100)
commitdc2ab6e646bb721ef2e1be268b876bd00e8fa802
treea828f3968b151924656061bfc709b00565aff877
parenteeb8753adc98022a55051d45a137b02a2bff4c23
parent02063c245c8a2a09e741cbce8302edf3ec14feef
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/packs/public.js`:
  Upstream removed an unused function in code that has
  been refactored a bit. Removed that function in the corresponding
  places.
12 files changed:
Gemfile
Gemfile.lock
app/controllers/relationships_controller.rb
app/javascript/flavours/glitch/packs/public.js
app/javascript/packs/public.js
app/models/user.rb
app/views/admin/custom_emojis/index.html.haml
app/views/admin/tags/index.html.haml
app/views/relationships/show.html.haml
config/routes.rb
package.json
yarn.lock