Merge commit 'dfa5889fc0
' into kb_migration
This commit is contained in:
commit
4a19077534
285 changed files with 938 additions and 822 deletions
|
@ -1,4 +1,4 @@
|
|||
import React from 'react';
|
||||
import { PureComponent } from 'react';
|
||||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
|
||||
import { connect } from 'react-redux';
|
||||
|
@ -8,7 +8,7 @@ import LinkFooter from 'mastodon/features/ui/components/link_footer';
|
|||
import { Helmet } from 'react-helmet';
|
||||
import { fetchServer, fetchExtendedDescription, fetchDomainBlocks } from 'mastodon/actions/server';
|
||||
import Account from 'mastodon/containers/account_container';
|
||||
import Skeleton from 'mastodon/components/skeleton';
|
||||
import { Skeleton } from 'mastodon/components/skeleton';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
import classNames from 'classnames';
|
||||
import { ServerHeroImage } from 'mastodon/components/server_hero_image';
|
||||
|
@ -48,7 +48,7 @@ const mapStateToProps = state => ({
|
|||
domainBlocks: state.getIn(['server', 'domainBlocks']),
|
||||
});
|
||||
|
||||
class Section extends React.PureComponent {
|
||||
class Section extends PureComponent {
|
||||
|
||||
static propTypes = {
|
||||
title: PropTypes.string,
|
||||
|
@ -87,7 +87,7 @@ class Section extends React.PureComponent {
|
|||
|
||||
}
|
||||
|
||||
class About extends React.PureComponent {
|
||||
class About extends PureComponent {
|
||||
|
||||
static propTypes = {
|
||||
server: ImmutablePropTypes.map,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue