Automatic merge of gitlab-org/gitlab-ce master

app/views/profiles/two_factor_auths/show.html.haml

@@ -25,7 +25,8 @@
 
       - else
         %p
-          Download the Google Authenticator application from App Store or Google Play Store and scan this code.
+          Install a soft token authenticator like <a href="https://freeotp.github.io/">FreeOTP</a>
+          or Google Authenticator from your application repository and scan this QR code.
           More information is available in the #{link_to('documentation', help_page_path('user/profile/account/two_factor_authentication'))}.
         .row.append-bottom-10
           .col-md-4