mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-11-04 10:44:12 +01:00 
			
		
		
		
	Merge branch 'master' of github.com:gogits/gogs into dev
This commit is contained in:
		
						commit
						0820b24f0b
					
				@ -71,7 +71,7 @@
 | 
			
		||||
			                <div class="checkbox">
 | 
			
		||||
			                    <label>
 | 
			
		||||
			                        <input type="checkbox" name="active" {{if .User.IsActive}}checked{{end}}>
 | 
			
		||||
			                        <strong>This account has activated</strong>
 | 
			
		||||
			                        <strong>This account is activated</strong>
 | 
			
		||||
			                    </label>
 | 
			
		||||
			                </div>
 | 
			
		||||
			            </div>
 | 
			
		||||
@ -82,7 +82,7 @@
 | 
			
		||||
			                <div class="checkbox">
 | 
			
		||||
			                    <label>
 | 
			
		||||
			                        <input type="checkbox" name="admin" {{if .User.IsAdmin}}checked{{end}}>
 | 
			
		||||
			                        <strong>This account has administor permisson</strong>
 | 
			
		||||
			                        <strong>This account has administrator permissions</strong>
 | 
			
		||||
			                    </label>
 | 
			
		||||
			                </div>
 | 
			
		||||
			            </div>
 | 
			
		||||
@ -100,4 +100,4 @@
 | 
			
		||||
 | 
			
		||||
	</div>
 | 
			
		||||
</div>
 | 
			
		||||
{{template "base/footer" .}}
 | 
			
		||||
{{template "base/footer" .}}
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user