diff options
author | Christopher Speller <crspeller@gmail.com> | 2017-05-12 09:12:55 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-12 09:12:55 -0400 |
commit | 1397798f1763b0848957a8672c8d40b6243764d5 (patch) | |
tree | 5d109da2e9e088f16eff0ad1421876a3d3da412e /webapp/components/header_footer_template.jsx | |
parent | b1c39204a63a87d2cbc57f66cf9db50c938b2ee5 (diff) | |
parent | 9d109b070037951fcd0832b785eba8a3db9a157c (diff) | |
download | chat-1397798f1763b0848957a8672c8d40b6243764d5.tar.gz chat-1397798f1763b0848957a8672c8d40b6243764d5.tar.bz2 chat-1397798f1763b0848957a8672c8d40b6243764d5.zip |
Merge pull request #6401 from mattermost/merge-3.9
Merge release-3.9 branch into master
Diffstat (limited to 'webapp/components/header_footer_template.jsx')
-rw-r--r-- | webapp/components/header_footer_template.jsx | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/webapp/components/header_footer_template.jsx b/webapp/components/header_footer_template.jsx index c41d7ee41..6fb9c9046 100644 --- a/webapp/components/header_footer_template.jsx +++ b/webapp/components/header_footer_template.jsx @@ -33,20 +33,18 @@ export default class NotLoggedIn extends React.Component { ); } - if (global.window.mm_config.TermsOfServiceLink) { - content.push( - <a - key='terms_link' - id='terms_link' - className='pull-right footer-link' - target='_blank' - rel='noopener noreferrer' - href={global.window.mm_config.TermsOfServiceLink} - > - <FormattedMessage id='web.footer.terms'/> - </a> - ); - } + content.push( + <a + key='terms_link' + id='terms_link' + className='pull-right footer-link' + target='_blank' + rel='noopener noreferrer' + href={global.window.mm_config.TermsOfServiceLink} + > + <FormattedMessage id='web.footer.terms'/> + </a> + ); if (global.window.mm_config.PrivacyPolicyLink) { content.push( |