Merge remote-tracking branch 'upstream/master' into new-ui-with-sync-image

Browse Source

Conflicts:
	utils/registry/repository.go

...

This commit is contained in:

Wenkai Yin 2016-06-30 14:24:05 +08:00

parent a540d2f985 843c4d4ba2

commit 558b7b5de4

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

Diff Content Not Available