luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-20 05:44:01 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/statuses
History
Thibaut Girka 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
  conflicts caused by image URLs being different
- app/models/status.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
  some strings were changed upstream
- spec/models/status_spec.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline
2019-10-10 17:26:08 +02:00
..
_attachment_list.html.haml
_detailed_status.html.haml Remove lang attribute from individual statuses (#12124) 2019-10-09 03:45:05 +02:00
_og_description.html.haml
_og_image.html.haml
_poll.html.haml Add voters count support (#11917) 2019-09-29 22:58:01 +02:00
_simple_status.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2019-10-10 17:26:08 +02:00
_status.html.haml
embed.html.haml
show.html.haml Prevent archiving when user set "noindex" (#11421) 2019-07-28 13:46:04 +02:00