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

Browse source

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

...

This commit is contained in:

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

parent 884bc4ffd8 2aea247208

commit 887bc1b594

12 changed files with 143 additions and 78 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

8

modules/bindata/bindata.go

View file

File diff suppressed because one or more lines are too long