OpenSource/mastodon
OpenSource/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-03-15 01:12:29 +01:00
Code Issues Projects Releases Packages Wiki Activity
mastodon/app
History
Claire 4e3c68e025 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.
2022-03-17 19:23:39 +01:00
..
chewy Change how changes to media attachments are stored for edits () 2022-03-09 09:06:17 +01:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2022-03-15 20:45:27 +01:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2022-03-17 19:23:39 +01:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2022-03-17 19:23:39 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2022-03-17 19:23:39 +01:00
mailers Add trending statuses () 2022-02-25 00:34:14 +01:00
models Merge branch 'main' into glitch-soc/merge-upstream 2022-03-15 20:45:27 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
presenters Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2022-03-10 09:52:45 +01:00
services Merge branch 'main' into glitch-soc/merge-upstream 2022-03-12 20:20:58 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2022-02-26 09:29:23 +01:00
views Merge branch 'main' into glitch-soc/merge-upstream 2022-03-15 20:45:27 +01:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2022-03-10 09:52:45 +01:00