Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb

2019-09-30 12:23:57 +02:00

..

_attachment_list.html.haml

…

_detailed_status.html.haml

Fix public page crash due to audio player, fix unpause in audio player (#11652)

2019-08-25 02:13:40 +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-08-29 12:07:50 +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