luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-01 02:53:47 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app
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
..
chewy
controllers Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2021-05-22 13:11:31 +02:00
mailers Prepare Mastodon for Rails 6 (#15911) 2021-03-17 10:09:55 +01:00
models Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
presenters
serializers Merge branch 'main' into glitch-soc/merge-upstream 2021-06-30 00:42:52 +02:00
services Merge branch 'main' into glitch-soc/merge-upstream 2021-05-22 13:11:31 +02:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
views Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2021-06-24 08:08:02 +02:00