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

Browse source

# Conflicts:
#	modules/bindata/bindata.go
#	public/css/gogs.min.css
#	templates/repo/header.tmpl

...

This commit is contained in:

Unknwon 2015-08-10 00:37:42 +08:00

parent 590c464c56 8a3ee795d2

commit a79586cc54

31 changed files with 1240 additions and 466 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

modules/bindata/bindata.go

View file

File diff suppressed because one or more lines are too long