]> cat aescling's git repositories - mastodon.git/commit
cat aescling's git repositories / mastodon.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: db5baf3 8428faa)
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Wed, 16 Jun 2021 09:24:55 +0000 (11:24 +0200)
committerClaire <claire.github-309c@sitedethib.com>
Wed, 16 Jun 2021 09:24:55 +0000 (11:24 +0200)
commit4aa78027ea747bb932645df31c831d632044e200
tree9d937d5c21246c32ef80178ae637632e840bed38tree | snapshot
parentdb5baf3d1a93cbf6961f721205cff0beaf71bffdcommit | diff
parent8428faa0859d86c97950084658498a2c25e26f15commit | diff
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `Gemfile.lock`: upstream-updated dependency (redis) textually too close to
   glitch-specific one (redcarpet).
   Ported upstream change.
Gemfile diff1 | diff2 | blob | history
Gemfile.lock diff1 | diff2 | blob | history
package.json diff1 | diff2 | blob | history
yarn.lock diff1 | diff2 | blob | history
source code fur Kibicat Mastodon