luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-20 04:07:45 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app
History
Claire 50b430d9a2 Merge branch 'main' into glitch-soc/merge-upstream 
- `app/views/statuses/_simple_status.html.haml`:
  Small markup change in glitch-soc, on a line that has been modified by
  upstream. Ported upstream changes.
2021-05-07 18:21:59 +02:00
..
chewy
controllers Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +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-05-07 18:21:59 +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-07 18:21:59 +02:00
services Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +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-07 18:21:59 +02:00