fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-27 15:54:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app
History
Claire b2eaf5562d Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream added some documentation in the README, but our README is pretty
  different and barebone.
  Kept our README.
2021-10-14 22:14:26 +02:00
..
chewy Change tootctl search deploy algorithm (#14300) 2020-07-14 18:10:35 +02:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 21:44:57 +02:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 22:14:26 +02:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 22:14:26 +02:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 21:44:57 +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-10-14 22:14:26 +02:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
presenters Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 21:44:57 +02:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 21:44:57 +02:00
services Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 21:44:57 +02:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 22:14:26 +02:00
views Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 21:44:57 +02:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2021-08-20 13:01:50 +02:00