Unknwon 887bc1b594 Merge branch 'develop' of github.com:gogits/gogs into feature/pull_request2 ...

# Conflicts:
#	modules/bindata/bindata.go
#	public/css/gogs.min.css

2015-08-10 23:01:41 +08:00

..

bindata.go

Merge branch 'develop' of github.com:gogits/gogs into feature/pull_request2

2015-08-10 23:01:41 +08:00