Merge branch 'master' of localhost:xiaoxiao/gogs3

Browse Source

Conflicts:
	.gitignore
	LICENSE

pull/197/head

Lunny Xiao 11 years ago

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

Write Preview

Loading…

Cancel

Save