ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/db
History
Claire 3160e050a9 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/accounts_helper.rb`:
  Conflict due to upstream changing how followers count is displayed while we
  have an option to hide followers count.
  Ported upstream change.
- `app/views/accounts/_header.html.haml`:
  Conflict due to upstream changing how followers count is displayed while we
  have an option to hide followers count.
  Ported upstream change.
- `app/views/directories/index.html.haml`:
  Conflict due to upstream changing how followers count is displayed while we
  have an option to hide followers count.
  Ported upstream change.
 		2021-07-08 16:17:19 +02:00
..
migrate Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
post_migrate Merge branch 'main' into glitch-soc/merge-upstream 2021-06-03 20:47:02 +02:00
views Improve performance of follow recommendation scheduler (#16159) 2021-05-05 22:04:52 +02:00
schema.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
seeds.rb Change unconfirmed user login behaviour (#11375) 2019-07-22 10:48:50 +02:00