luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-04 05:54:27 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/stream_entries
History
David Yip b9f7bc149b Merge branch 'origin/master' into sync/upstream 
Conflicts:
	app/javascript/mastodon/components/status_list.js
	app/javascript/mastodon/features/notifications/index.js
	app/javascript/mastodon/features/ui/components/modal_root.js
	app/javascript/mastodon/features/ui/components/onboarding_modal.js
	app/javascript/mastodon/features/ui/index.js
	app/javascript/styles/about.scss
	app/javascript/styles/accounts.scss
	app/javascript/styles/components.scss
	app/presenters/instance_presenter.rb
	app/services/post_status_service.rb
	app/services/reblog_service.rb
	app/views/about/more.html.haml
	app/views/about/show.html.haml
	app/views/accounts/_header.html.haml
	config/webpack/loaders/babel.js
	spec/controllers/api/v1/accounts/credentials_controller_spec.rb
2017-09-09 14:27:47 -05:00
..
_content_spoiler.html.haml Merge upstream!! #64 <3 <3 2017-07-12 02:03:17 -07:00
_detailed_status.html.haml Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
_media.html.haml Images now behind CWs on static pages 2017-06-29 22:59:28 -07:00
_og_description.html.haml Simplify the og:image and og:description code in stream_entries/show (#1934) 2017-04-16 16:38:02 +02:00
_og_image.html.haml Simplify the og:image and og:description code in stream_entries/show (#1934) 2017-04-16 16:38:02 +02:00
_simple_status.html.haml Merge upstream!! #64 <3 <3 2017-07-12 02:03:17 -07:00
_status.html.haml Pinned statuses (#4675) 2017-08-25 01:41:18 +02:00
embed.html.haml Update status embeds (#4742) 2017-08-30 10:23:43 +02:00
show.html.haml Add alternate links to ActivityPub resources from HTML/HEAD variants (#4586) 2017-08-13 00:45:04 +02:00