Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Ondřej Hruška 2017-08-07 22:43:52 +02:00
commit 7a1ca8b0df
82 changed files with 419 additions and 260 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/components/column.js
View file

@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import detectPassiveEvents from 'detect-passive-events';
import scrollTop from '../scroll';
import { scrollTop } from '../scroll';
export default class Column extends React.PureComponent {