Merge branch 'koh'
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:
commit
f3259c862b
57 changed files with 537 additions and 141 deletions
|
@ -5,7 +5,6 @@ from flask.ext.mail import Message
|
|||
|
||||
from app import mail, app, get_app_url
|
||||
from data import model
|
||||
from util.gravatar import compute_hash
|
||||
from util.jinjautil import get_template_env
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
|
Reference in a new issue