luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-21 20:56:50 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/stream_entries
History
Thibaut Girka bfeac6747a 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
_og_image.html.haml
_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