Merge branch 'master' into master · 20b53e6add - Mastodon - Wobbl.XYZ Git Repository

tarrien/Mastodon

0 Fork 0

JantsoP authored and

GitHub committed 2017-04-05 10:07:17 +02:00

2 parents 3ec221d3b7 ccb6a658fd

commit 20b53e6add

57 files changed

+570 -164

No files matched your search

									
										app/assets/javascripts/components/features/notifications/components/clear_column_button.jsx
									
		+1
		-1
	
												View File
												
				@@ -9,7 +9,7 @@ const iconStyle = {

				};

				const ClearColumnButton = ({ onClick }) => (

				  <div className='column-icon' style={iconStyle} onClick={onClick}>

				  <div className='column-icon' tabindex='0' style={iconStyle} onClick={onClick}>

				    <i className='fa fa-trash' />

				  </div>

				);