diff options
| author | kibigo! <marrus-sh@users.noreply.github.com> | 2017-06-25 12:51:31 -0700 |
|---|---|---|
| committer | kibigo! <marrus-sh@users.noreply.github.com> | 2017-06-25 12:51:31 -0700 |
| commit | 8ea779e59a516d96e3320aaaaf1cda987752c5e6 (patch) | |
| tree | 8212e09927e3320ac3b0bdd9409a6a8758bef84c | |
| parent | 7eda83a36a56301b890e2fa33f5a34226110d42e (diff) | |
Patching rebase errors
| -rw-r--r-- | app/javascript/mastodon/features/getting_started/index.js | 2 | ||||
| -rw-r--r-- | app/javascript/mastodon/features/ui/components/onboarding_modal.js | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js index 16f71966b..ac93b3d47 100644 --- a/app/javascript/mastodon/features/getting_started/index.js +++ b/app/javascript/mastodon/features/getting_started/index.js @@ -97,7 +97,7 @@ export default class GettingStarted extends ImmutablePureComponent { <FormattedMessage id='getting_started.open_source_notice' defaultMessage='Glitchsoc is open source software, a friendly fork of {Mastodon}. You can contribute or report issues on GitHub at {github}.' - values={{ github: <a href='https://github.com/glitch-soc/mastodon' rel='noopener' target='_blank'>glitch-soc/mastodon</a>, Mastodon: <a href='https://github.com/tootsuite/mastodon' rel='noopener' target='_blank'>Mastodon</a>}} + values={{ github: <a href='https://github.com/glitch-soc/mastodon' rel='noopener' target='_blank'>glitch-soc/mastodon</a>, Mastodon: <a href='https://github.com/tootsuite/mastodon' rel='noopener' target='_blank'>Mastodon</a> }} /> </p> </div> diff --git a/app/javascript/mastodon/features/ui/components/onboarding_modal.js b/app/javascript/mastodon/features/ui/components/onboarding_modal.js index 1b8d844d3..4c1c0f7c1 100644 --- a/app/javascript/mastodon/features/ui/components/onboarding_modal.js +++ b/app/javascript/mastodon/features/ui/components/onboarding_modal.js @@ -155,8 +155,7 @@ const PageSix = ({ admin, domain }) => { </div> ); }; -<a href='https://github.com/glitch-soc/mastodon' target='_blank' rel='noopener'>GitHub</a> }} /></p> - <p><FormattedMessage id='onboarding.page_six.apps_available' defaultMessage='There are {apps} available for iOS, Android and other platforms.' values={{ apps: <a href='https://github.com/tootsuite/documentation/blob/master/Using-Mast + PageSix.propTypes = { admin: ImmutablePropTypes.map, domain: PropTypes.string.isRequired, |