]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Sun, 12 Apr 2020 14:50:27 +0000 (16:50 +0200)
committerThibaut Girka <thib@sitedethib.com>
Sun, 12 Apr 2020 14:50:27 +0000 (16:50 +0200)
commitfdd0beefa7176f4d0df3adcf37156229889127d7
tree9a618d6a5c0759b28b89f663ff0fc8eee6c4db6c
parent51bbf0b68dc504c441cb929e4fbf8d8c6e04df42
parent490ff09c5a503f1e5f9cad964470fdefa3eabea8
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  We have a different README than upstream, discarded upstream changes
  and kept ours.
Gemfile
Gemfile.lock
app/views/layouts/public.html.haml
yarn.lock