mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-29 10:57:44 +09:00 
			
		
		
		
	Merge branch 'master' into feat/approval-new
# Conflicts: # models/error.go # models/migrations/migrations.go # models/models.go # public/js/index.js
This commit is contained in:
		| @@ -535,6 +535,15 @@ _Symbols used in table:_ | ||||
|       <td>✓</td> | ||||
|       <td>✓</td> | ||||
|     </tr> | ||||
|     <tr> | ||||
|       <td>FIDO U2F (2FA)</td> | ||||
|       <td>✓</td> | ||||
|       <td>✘</td> | ||||
|       <td>✓</td> | ||||
|       <td>✓</td> | ||||
|       <td>✓</td> | ||||
|       <td>✓</td> | ||||
|     </tr> | ||||
|     <tr> | ||||
|       <td>Webhook support</td> | ||||
|       <td>✓</td> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user