Merge branch '14500_admin_api_tokens'
authorJanicki Artur <artur.janicki@contractors.roche.com>
Fri, 7 Dec 2018 09:51:48 +0000 (10:51 +0100)
committerJanicki Artur <artur.janicki@contractors.roche.com>
Fri, 7 Dec 2018 09:51:48 +0000 (10:51 +0100)
refs #14500

Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki@contractors.roche.com>


Trivial merge