Merge branch 'develop' of https://github.com/SergioBenitez/gogs into develop

Browse Source

# Conflicts:
#	modules/bindata/bindata.go

...

This commit is contained in:

Unknwon

2015-09-10 14:55:29 -04:00

parent 52ec80fa18 b954a22ce2

commit cbd6276200

10 changed files with 211 additions and 146 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

File diff suppressed because one or more lines are too long