mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-11-04 01:34:27 +00:00 
			
		
		
		
	Merge branch 'master' of github.com:gogits/gogs into dev
Conflicts: dockerfiles/README.md
This commit is contained in:
		Conflicts: dockerfiles/README.md