]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Mon, 26 Oct 2020 14:47:21 +0000 (15:47 +0100)
committerThibaut Girka <thib@sitedethib.com>
Mon, 26 Oct 2020 14:48:16 +0000 (15:48 +0100)
commit9c34090db84fc28bf6c40da700095f025f1887ea
tree960afb18131d57f7120c0d584915f0c2c29902bb
parent36e5c9d45be0e94216b5b92ea8749a00bb68e0e3
parent3678b10823a691256ad63c1c4df8dc659dfc3bc0
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/services/process_mentions_service.rb`:
  glitch-soc local-only handling, ported upstream changes
Gemfile
Gemfile.lock
app/services/process_mentions_service.rb
package.json
yarn.lock