Merge branch 'master' into 'master'

Doc: Added FreeOTP to 2FA

I have just added a note about a free alternative to Google Authenticator to the documentation of your two factor authentication.

See merge request !777

doc/workflow/two_factor_authentication.md

@@ -21,7 +21,8 @@ is to know your username and password *and* have access to your phone.
 
 **On your phone:**
 
-1. Install a compatible application. We recommend [Google Authenticator].
+1. Install a compatible application. We recommend [Google Authenticator]
+\(proprietary\) or [FreeOTP] \(open source\).
 1. In the application, add a new entry in one of two ways:
     * Scan the code with your phone's camera to add the entry automatically.
     * Enter the details provided to add the entry manually.
@@ -63,3 +64,4 @@ your phone's application or a recovery code to log in.
 1. Click **Disable Two-factor Authentication**.
 
 [Google Authenticator]: https://support.google.com/accounts/answer/1066447?hl=en
+[FreeOTP]: https://fedorahosted.org/freeotp/
\ No newline at end of file