mastodon - Plural Café fork of Mastodon/Glitch Social

Age	Commit message (Collapse)	Author
2019-11-06	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Conflicts: - `package.json`
2019-10-27	Change message of public timeline for local only (#12224)	Yamagishi Kazutoshi

2019-08-19	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	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-16	Fix blurhash and autoplay not working on public pages (#11585)	Eugen Rochko

2019-03-13	[Glitch] Redesign landing page	Eugen Rochko
	Port 65fffeac3f960f9c74d693525a73ac14b201bf2b to glitch-soc
2019-03-12	Redesign landing page (#10232)	Eugen Rochko