]> source.dussan.org Git - gitea.git/commit
Merge branch 'dev' of github.com:gogits/gogs into dev
authorUnknown <joe2010xtmf@163.com>
Wed, 9 Apr 2014 18:15:09 +0000 (14:15 -0400)
committerUnknown <joe2010xtmf@163.com>
Wed, 9 Apr 2014 18:15:09 +0000 (14:15 -0400)
commit5f6bd323f530410c687b17b0251a5a2ffacb755b
treed7c96fa01262d7cf26b6b06d58d86dfd942a2014
parenta773cf1d876d59ab036ebf8a6843bf78da83531e
parent8683d2f8570fedad694d0610074296a1452d3942
Merge branch 'dev' of github.com:gogits/gogs into dev

Conflicts:
models/oauth2.go
gogs.go
models/oauth2.go