treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/app/views/accounts
History
David Yip da3f22ee7d 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
..
_follow_grid.html.haml Optimize follower_accounts and following_accounts (#2820) 2017-05-06 04:03:07 +02:00
_grid_card.html.haml Redesign public profiles (#4608) 2017-08-16 17:12:58 +02:00
_header.html.haml Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
_nothing_here.html.haml Localizations for most server-side strings 2016-11-16 00:55:33 +01:00
_og.html.haml Add og:url tags (#2298) 2017-04-22 17:29:46 +02:00
show.html.haml Pinned statuses (#4675) 2017-08-25 01:41:18 +02:00