luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-16 18:35:20 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app
History
Claire 8ec4be4233 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Not a real conflict, upstream-updated dependency (redis) textually too
  close to glitch-soc-only dependecy.
  Updated redis gem like upstream did.
2021-08-09 23:25:49 +02:00
..
chewy
controllers Merge branch 'main' into glitch-soc/merge-upstream 2021-08-09 23:25:49 +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-08-09 23:25:49 +02:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2021-08-09 23:25:49 +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-08-09 23:25:49 +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-02-22 15:23:46 +01:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2021-07-11 21:41:23 +02:00
services Merge branch 'main' into glitch-soc/merge-upstream 2021-08-09 23:25:49 +02:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2021-07-11 21:41:23 +02:00
views Merge branch 'main' into glitch-soc/merge-upstream 2021-08-09 23:25:49 +02:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2021-08-09 23:25:49 +02:00