mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-13 06:35:08 +01:00
Code Issues Projects Releases Wiki Activity
b9f7bc149b
mastodon/app/views/about
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
..
_contact.html.haml Do not create empty a element when there is no e-mail (#4455) 2017-07-30 16:24:18 +02:00
_features.html.haml Redesign the landing page, mount public timeline on it (#4122) 2017-07-11 15:27:59 +02:00
_registration.html.haml Fix autocomplete option in haml files (#4438) 2017-07-29 14:20:31 +02:00
more.html.haml Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
show.html.haml Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
terms.html.haml Redesign /terms page (#4338) 2017-07-24 17:15:15 +02:00