source.dussan.org Git - gitea.git/commit

]> source.dussan.org Git - gitea.git/commit

author	Unknown <joe2010xtmf@163.com>
	Tue, 25 Mar 2014 10:54:22 +0000 (06:54 -0400)
committer	Unknown <joe2010xtmf@163.com>
	Tue, 25 Mar 2014 10:54:22 +0000 (06:54 -0400)
commit	e95be2cb3e1e320ecd86f0743acaeeb76f50e3e5
tree	746b1ab1ab5626fb20ddd04121c29a951a6f84b3	tree \| snapshot
parent	eeb793524f2da4afdca017b585d9cfb6e9628e85	commit \| diff
parent	94ac5ebb9f100c77da02b56961119a25cd9e6d20	commit \| diff

Merge branch 'master' of github.com:gogits/gogs

Conflicts:
conf/app.ini

conf/app.ini	diff1 \|	diff2 \|	blob \| history
modules/base/conf.go	diff1 \|	diff2 \|	blob \| history
templates/user/delete.tmpl	diff1 \|	diff2 \|	blob \| history

Git with a cup of tea! Painless self-hosted all-in-one software development service, including Git hosting, code review, team collaboration, package registry and CI/CD: https://github.com/go-gitea/gitea

RSS Atom

conf/app.ini	diff1 \|	diff2 \|	blob \| history
modules/base/conf.go	diff1 \|	diff2 \|	blob \| history
templates/user/delete.tmpl	diff1 \|	diff2 \|	blob \| history