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

Browse Source

# Conflicts:
#	public/css/gogs.min.css

...

This commit is contained in:

Unknwon

2015-08-12 19:10:16 +08:00

parent ab2d0b3b44 33f33e055a

commit a01867cc1a

4 changed files with 77 additions and 38 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

public/css/gogs.min.css

Vendored

+1 -1

File diff suppressed because one or more lines are too long