]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/master
authorThibaut Girka <thib@sitedethib.com>
Tue, 11 Aug 2020 17:19:27 +0000 (19:19 +0200)
committerThibaut Girka <thib@sitedethib.com>
Tue, 11 Aug 2020 17:19:27 +0000 (19:19 +0200)
commit78fa15d08ff0b840b8b95f87e99a80a109110530
treeab65860a80c213128c11734b396bf78954dd9003
parent03712799e2cd51613c8e73cbd6379c8058fae466
parentef057584fd2714d94666f9ffef4aa89147eda72c
Merge branch 'master' into glitch-soc/master

Conflicts:
- `streaming/index.js`:
  Upstream entirely refactored it.
  Ported our changes to upstream's refactor. Hopefuly.
config/routes.rb
streaming/index.js