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

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

author	slene <vslene@gmail.com>
	Sat, 15 Mar 2014 12:39:56 +0000 (20:39 +0800)
committer	slene <vslene@gmail.com>
	Sat, 15 Mar 2014 12:39:56 +0000 (20:39 +0800)
commit	a33d03f008df3af4db481d6c207588d99d48ea50
tree	b7be9782750a34be145e75977f2eb55e8fb54f46	tree \| snapshot
parent	81fedd819818d0a5c39044cf5af504e8045c9233	commit \| diff
parent	e9fdf1031da4bf3c1acff0377b1d125ad99274e6	commit \| diff

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

Conflicts:
routers/user/user.go
web.go

modules/auth/user.go	diff1 \|	diff2 \|	blob \| history
routers/user/user.go	diff1 \|	diff2 \|	blob \| history
web.go	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

modules/auth/user.go	diff1 \|	diff2 \|	blob \| history
routers/user/user.go	diff1 \|	diff2 \|	blob \| history
web.go	diff1 \|	diff2 \|	blob \| history