diff options
| author | JantsoP <jantso.porali@gmail.com> | 2017-04-04 08:41:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-04 08:41:46 +0200 |
| commit | db4a41cf58f6b15e380ff1fdbc8f392e31e4235b (patch) | |
| tree | a68429f1bade4869fccc4af5bcef8afbe570e1e1 /app/assets | |
| parent | dc89fc17cc35f8e1deaffb30ae581ac453a7a9fc (diff) | |
| parent | eb023beb4975a019d6a3b3091483c91c2c837bbd (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/images/fluffy-elephant-friend.png | bin | 1101408 -> 60667 bytes | |||
| -rw-r--r-- | app/assets/javascripts/components/features/getting_started/index.jsx | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/components/locales/en.jsx | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/images/fluffy-elephant-friend.png b/app/assets/images/fluffy-elephant-friend.png index 11787e936..f0df29927 100644 --- a/app/assets/images/fluffy-elephant-friend.png +++ b/app/assets/images/fluffy-elephant-friend.png Binary files differdiff --git a/app/assets/javascripts/components/features/getting_started/index.jsx b/app/assets/javascripts/components/features/getting_started/index.jsx index 8253ad017..d7a78d9cc 100644 --- a/app/assets/javascripts/components/features/getting_started/index.jsx +++ b/app/assets/javascripts/components/features/getting_started/index.jsx @@ -43,7 +43,7 @@ const GettingStarted = ({ intl, me }) => { <div className='scrollable optionally-scrollable' style={{ display: 'flex', flexDirection: 'column' }}> <div className='static-content getting-started'> - <p><FormattedMessage id='getting_started.open_source_notice' defaultMessage='Mastodon is open source software. You can contribute or report issues on github at {github}. {apps}.' values={{ github: <a href="https://github.com/tootsuite/mastodon" target="_blank">tootsuite/mastodon</a>, apps: <a href="https://github.com/tootsuite/mastodon/blob/master/docs/Using-Mastodon/Apps.md" target="_blank"><FormattedMessage id='getting_started.apps' defaultMessage='Various apps are available' /></a> }} /></p> + <p><FormattedMessage id='getting_started.open_source_notice' defaultMessage='Mastodon is open source software. You can contribute or report issues on GitHub at {github}. {apps}.' values={{ github: <a href="https://github.com/tootsuite/mastodon" target="_blank">tootsuite/mastodon</a>, apps: <a href="https://github.com/tootsuite/mastodon/blob/master/docs/Using-Mastodon/Apps.md" target="_blank"><FormattedMessage id='getting_started.apps' defaultMessage='Various apps are available' /></a> }} /></p> </div> </div> </Column> diff --git a/app/assets/javascripts/components/locales/en.jsx b/app/assets/javascripts/components/locales/en.jsx index 2d3360b6b..53e2898eb 100644 --- a/app/assets/javascripts/components/locales/en.jsx +++ b/app/assets/javascripts/components/locales/en.jsx @@ -25,7 +25,7 @@ const en = { "getting_started.heading": "Getting started", "getting_started.about_addressing": "You can follow people if you know their username and the domain they are on by entering an e-mail-esque address into the search form.", "getting_started.about_shortcuts": "If the target user is on the same domain as you, just the username will work. The same rule applies to mentioning people in statuses.", - "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on github at {github}. {apps}.", + "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}. {apps}.", "column.home": "Home", "column.community": "Local timeline", "column.public": "Federated timeline", |
