Merge branch 'new-signing-ui' of github.com:coreos-inc/quay into new-signing-ui

# Conflicts:
#	static/js/types/common.types.ts
This commit is contained in:
Evan Cordell 2017-05-22 11:27:49 -04:00
commit 961ebdfe44

View file

@ -109,10 +109,10 @@ export type Trigger = {
* Represents a set of apostille delegations. * Represents a set of apostille delegations.
*/ */
export type ApostilleDelegationsSet = { export type ApostilleDelegationsSet = {
delegations: [delegationName: string]: ApostilleSignatureDocument delegations: {[delegationName: string]: ApostilleSignatureDocument};
// The error that occurred, if any. // The error that occurred, if any.
error: string | null error: string | null;
}; };
/** /**