Merge branch 'koh'

Browse source

Conflicts:
	auth/scopes.py
	requirements-nover.txt
	requirements.txt
	static/css/quay.css
	static/directives/namespace-selector.html
	static/js/app.js
	static/partials/manage-application.html
	templates/oauthorize.html

...

This commit is contained in:

Jimmy Zelinskie 2014-12-01 12:30:09 -08:00

parent 5cb36fe053 8591889c62

commit f3259c862b

57 changed files with 537 additions and 141 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

BIN

static/img/empty.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 95 B