Thibaut Girka c060523dc2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json		2019-08-19 21:49:35 +02:00
..
_bio.html.haml	Add Keybase integration (#10297)	2019-03-18 21:00:55 +01:00
_header.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-22 20:40:04 +02:00
_moved.html.haml	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	2019-07-07 16:16:51 +02:00
_og.html.haml	Add description meta tag additionally to og:description (#8941)	2018-10-10 02:21:30 +02:00
show.html.haml	Add an RSS feed tagged to a public profile page (#10502)	2019-08-18 20:54:36 +02:00