Thibaut Girka 767cc06fe2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: .circleci/config.yml app/controllers/authorize_follows_controller.rb app/javascript/packs/public.js Moved new stuff from packs/public.js to core/public.js. Added appropriate use_pack in new controllers.		2018-08-18 18:04:49 +02:00
..
_detailed_status.html.haml	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00
_og_description.html.haml	Revert #6479, hide sensitive text/images from OpenGraph previews (#6818)	2018-03-18 20:33:07 +01:00
_og_image.html.haml	Add admin setting to enable OG previews for sensitive media (#7962)	2018-07-06 02:15:56 +02:00
_simple_status.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-18 18:04:49 +02:00
_status.html.haml	Add "sign in to participate" message to public toot page (#8200)	2018-08-18 12:48:27 +02:00
embed.html.haml	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
show.html.haml	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00