luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2025-01-04 03:27:06 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app
History
Claire 4aa78027ea Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`: upstream-updated dependency (redis) textually too close to
   glitch-specific one (redcarpet).
   Ported upstream change.
2021-06-16 11:24:55 +02:00
..
chewy
controllers Merge branch 'main' into glitch-soc/merge-upstream 2021-06-03 20:47:02 +02:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2021-05-22 13:11:31 +02:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2021-06-16 11:24:55 +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-06-03 20:47:02 +02:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
presenters Merge branch 'main' into glitch-soc/merge-upstream 2021-02-22 15:23:46 +01:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2021-05-17 10:30:34 +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-05-07 18:21:59 +02:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2021-05-22 13:11:31 +02:00