luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-10 17:05:17 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/stream_entries
History
Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb
2018-10-01 12:43:20 +02:00
..
_detailed_status.html.haml Add a new preference to always hide all media (#8569) 2018-09-25 05:09:35 +02:00
_og_description.html.haml
_og_image.html.haml
_simple_status.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
_status.html.haml Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
embed.html.haml Add animate custom emoji param to embed pages (#8507) 2018-08-30 23:14:01 +02:00
show.html.haml Add remote interaction dialog for toots (#8202) 2018-08-18 03:03:12 +02:00