Merge branch 'master' of localhost:xiaoxiao/gogs3

Browse Source

Conflicts:
	.gitignore
	LICENSE

...

This commit is contained in:

Lunny Xiao

2014-03-25 17:19:02 +08:00

parent 5bfad6867d c61fa28f49

commit fcbe7ef5c1

2 changed files with 2 additions and 2 deletions

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

Show Stats Download Patch File Download Diff File Expand all files Collapse all files