me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
glitchier-soc/app/javascript/mastodon/features/notifications/components
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
..
clear_column_button.js Use Class and Property Decorators (#3730) 2017-06-23 19:36:54 +02:00
column_settings.js Improve accessibility (part 2) (#4377) 2017-07-26 13:46:53 +02:00
notification.js Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
setting_toggle.js Don't unconditionally call preventDefault and stopPropagation on all keyup events (#4777) 2017-09-02 16:27:16 +02:00