Merge branch 'dev' into feature/querySessionStatus

brockallen · brockallen · commit 1443996a6034 · 2018-10-05T16:40:07.000-04:00
# Conflicts:
#	index.d.ts
diff --git a/gulpfile.js b/gulpfile.js
@@ -126,7 +126,7 @@ var files = [
 //    ,'jsrsasign/ext/ec-patch-min.js'
     ,'jsrsasign/ext/json-sans-eval-min.js'
 
-//	,'jsrsasign/min/asn1-1.0.min.js'
+	  ,'jsrsasign/min/asn1-1.0.min.js'
   	,'jsrsasign/min/asn1hex-1.1.min.js'
 //  	,'jsrsasign/min/asn1x509-1.0.min.js'
 //  	,'jsrsasign/min/asn1cms-1.0.min.js'
diff --git a/index.d.ts b/index.d.ts
@@ -210,6 +210,7 @@ export interface UserManagerSettings extends OidcClientSettings {
   readonly monitorSession?: boolean;
   readonly checkSessionInterval?: number;
   readonly query_status_response_type?: string;
+  readonly stopCheckSessionOnError?: boolean;
   readonly revokeAccessTokenOnSignout?: any;
   readonly accessTokenExpiringNotificationTime?: number;
   readonly redirectNavigator?: any;
diff --git a/jsrsasign/dist/jsrsasign.js b/jsrsasign/dist/jsrsasign.js
