]> source.dussan.org Git - gitea.git/commitdiff
Merge branch 'access' into access_rewriteserv
authorPeter Smit <peter@smitmail.eu>
Mon, 23 Feb 2015 10:34:41 +0000 (12:34 +0200)
committerPeter Smit <peter@smitmail.eu>
Mon, 23 Feb 2015 10:34:41 +0000 (12:34 +0200)
1  2 
models/user.go

diff --cc models/user.go
Simple merge