tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Ondřej Hruška committed 2017-08-07 22:43:52 +02:00
2 parents b8791ae79b a3e53bd442
commit 7a1ca8b0df
82 files changed
+419 -260
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/javascript/mastodon/components/column.js
+1 -1
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 {