]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Thu, 14 Oct 2021 20:14:26 +0000 (22:14 +0200)
committerClaire <claire.github-309c@sitedethib.com>
Thu, 14 Oct 2021 20:14:26 +0000 (22:14 +0200)
commitb2eaf5562dd8378a7c83cc544885ea475d44f912
tree1d79559ae73a8f658569a0a01459452c903bb34b
parent7aec1bc30862b81de8dcb43b61f8fdd13c935ecd
parentec6eee96d0b398a99ba0abb9c1cf30c02729e52e
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Upstream added some documentation in the README, but our README is pretty
  different and barebone.
  Kept our README.
Gemfile.lock
Vagrantfile
app/javascript/styles/fonts/montserrat.scss
app/javascript/styles/fonts/roboto-mono.scss
app/javascript/styles/fonts/roboto.scss
config/environments/production.rb
package.json
yarn.lock