]> cat aescling's git repositories - mastodon.git/commit
cat aescling's git repositories / mastodon.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ac30017 443d114)
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Thu, 17 Mar 2022 18:23:39 +0000 (19:23 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Thu, 17 Mar 2022 18:23:39 +0000 (19:23 +0100)
commit4e3c68e0256e6aab4bb30f350dac4fc4386cb0b9
tree00a495e6f4abf68dbb9ecceae729c9e5345c318atree | snapshot
parentac300173f68d2497cccf4e5bf558d95fc6105c96commit | diff
parent443d114574ef152f14815afc5c4ed5c977dd9205commit | diff
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/helpers/accounts_helper.rb`:
  Upstream fixed an issue that glitch-soc did not have, in a place with
  glitch-soc changes to hide the number of followers.
  Kept glitch-soc's code.
app/helpers/application_helper.rb diff1 | diff2 | blob | history
db/schema.rb diff1 | diff2 | blob | history
source code fur Kibicat Mastodon