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-08-16 14:31:54 +08:00

parent 6d3e5a36a1 f8a4ab25fd

commit 55ccb00a47

23 changed files with 225 additions and 231 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

modules/bindata/bindata.go

+28 -28

File diff suppressed because one or more lines are too long