diff --git a/app/Company.php b/app/Company.php index ee6bb6c..f64bc1a 100644 --- a/app/Company.php +++ b/app/Company.php @@ -7,11 +7,17 @@ use Illuminate\Database\Eloquent\Model; class Company extends Model { // - protected $fillable = ['company_profile', 'reg_cert', 'company_name', 'registration_no', 'tax_no', 'tel_no', 'fax', 'address', 'city', 'postcode', 'state', 'country', 'contact_person']; + protected $fillable = ['user_id', 'company_profile', 'reg_cert', 'company_name', 'registration_no', 'tax_no', 'tel_no', 'fax', 'address', 'city', 'postcode', 'state', 'country', 'contact_person']; //protected $guarded = []; public function user() { return $this->belongsTo('App\User'); } + + public function deliveryinfo() { + + return $this->hasMany('App\Deliveryinfo'); + + } } diff --git a/app/Decisionitem.php b/app/Decisionitem.php index a5619eb..1844b9e 100644 --- a/app/Decisionitem.php +++ b/app/Decisionitem.php @@ -9,7 +9,7 @@ class Decisionitem extends Model protected $fillable = [ 'id', 'decision_id', - 'wi_id', + 'warehouseitem_id', 'num_of_item', ]; diff --git a/app/DeliveryInfo.php b/app/DeliveryInfo.php new file mode 100644 index 0000000..8aeacae --- /dev/null +++ b/app/DeliveryInfo.php @@ -0,0 +1,29 @@ +belongsTo('App\Company'); + + } + +} diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index 25c9a28..9ddcff5 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -7,6 +7,7 @@ use App\PasswordResets; use JWTAuth; use Auth; use App\Role; +use App\Company; use Aloha\Twilio\Twilio; use Tymon\JWTAuth\Exceptions\JWTException; @@ -30,10 +31,14 @@ class AuthController extends Controller public function sendVerification(Request $request){ $credentials = $request->only('phone'); $rules = [ - 'phone' => 'required|digits:10|unique:users' + 'phone' => 'required|digits_between:10,11|unique:users' ]; $validator = Validator::make($credentials, $rules); + if($validator->fails()){ + return response()->json(['success'=> false, 'message'=> 'The minimum length should be 10.' ], 400); + } + // create user if not exist $user = User::firstOrNew([ 'phone' => $request->phone @@ -41,24 +46,24 @@ class AuthController extends Controller $user->save(); // create token if not exist, update if exist - $token = mt_rand(0000,9999); + $token = mt_rand(0000,9999); - // for testing + // for testing if($request->phone == '0123456789'){ $token = "1234"; } - + $user_verification = $user->phoneVerification()->firstOrNew([ 'user_id' => $user->id, ]); $user_verification->token = $token; $user_verification->save(); - // TODO: send token to phone + // TODO: send token to phone //$message = "RM0.00 IZYIM: Verification code : ". $token; //$twilio = new Twilio(env('TWILIO_ACC'), env('TWILIO_TOKEN'), env('TWILIO_NUMBER')); //$twilio->message($request->phone, $message); - return response()->json(['success'=> true, 'message'=> 'A verification code has been send to your mobile number.' ]); + return response()->json(['success'=> true, 'message'=> 'A verification code has been send to your mobile number.' ], 200); } @@ -79,14 +84,14 @@ class AuthController extends Controller return response()->json([ 'success'=> true, 'message'=> 'Account already verified.' - ]); + ], 200); } } else{ return response()->json([ 'success'=> false, 'message'=> 'Please contact support.' - ]); + ], 400); } // check and verify valid token @@ -100,16 +105,16 @@ class AuthController extends Controller return response()->json(['error' => 'invalid_credentials'], 401); } - // TODO : Create company for user - - + // TODO : Create company for user + + $expiration = JWTAuth::setToken($userToken)->getPayload()->get('exp'); // all good so return the token return response()->json(['success' => true, 'token' => $userToken, 'token_type' => 'bearer', 'expires_in' => $expiration - time()]); } - return response()->json(['success'=> false, 'error'=> "Verification code is invalid."]); + return response()->json(['success'=> false, 'error'=> "Verification code is invalid."], 400); } /** @@ -130,9 +135,9 @@ class AuthController extends Controller $validator = Validator::make($credentials, $rules); if($validator->fails()) { - return response()->json(['success'=> false, 'error'=> $validator->messages()]); + return response()->json(['success'=> false, 'error'=> $validator->messages()], 400); } - + $name = $request->name; $password = $request->password; $role = $request->role; @@ -146,12 +151,13 @@ class AuthController extends Controller $user->attachRole($role); $user->update(['name' => $name, 'password' => Hash::make($password)]); - // TODO : create company for user - $company = new Company; - $company->user = $user; + // TODO : create company for user + $company = new Company; + $company->user_id = $user->id; $company->save(); - return response()->json(['success'=> true, 'message'=> 'Profile updated.']); + + return response()->json(['success'=> true, 'message'=> 'Profile updated.'], 200); } @@ -179,7 +185,7 @@ class AuthController extends Controller try { // attempt to verify the credentials and create a token for the user if (! $token = JWTAuth::attempt($credentials)) { - return response()->json(['success' => false, 'error' => 'We cant find an account with this credentials. Please make sure you entered the right information and you have verified your email address.'], 401); + return response()->json(['success' => false, 'error' => 'Phone or password incorrect'], 401); } } catch (JWTException $e) { // something went wrong whilst attempting to encode the token diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php index 037ea75..80b0c73 100644 --- a/app/Http/Controllers/CompanyController.php +++ b/app/Http/Controllers/CompanyController.php @@ -15,9 +15,30 @@ class CompanyController extends Controller $company = Company::where("user_id", Auth::user()->id)->first(); if (!$company) { - return response()->json(['message'=>'company not found'], 404); + return response()->json(['success'=> false, 'message'=>'Company not found'], 404); } + $rules = [ + 'company_name' => 'required', + 'registration_no' => 'required', + 'tax_no' => 'required', + 'tax_no' => 'required', + 'tel_no' => 'required', + 'fax' => 'required', + 'address' => 'required', + 'city' => 'required', + 'postcode' => 'required', + 'state' => 'required', + 'country' => 'required', + 'contact_person' => 'required' + ]; + + $validator = Validator::make($request->all(), $rules); + if($validator->fails()) { + return response()->json(['success'=> false, 'error'=> 'All the fields are required'], 400); + //return response()->json(['success'=> false, 'error'=> $validator->messages()], 400); + } + $company->company_name=$request->input('company_name'); $company->registration_no=$request->input('registration_no'); $company->tax_no=$request->input('tax_no'); @@ -30,8 +51,7 @@ class CompanyController extends Controller $company->country=$request->input('country'); $company->contact_person=$request->input('contact_person'); $company->save(); - - return response()->json(['company'=>$company],200); + return response()->json(['success'=> true, 'message'=>'Company created successfully'],200); } public function companyProfile(Request $request) @@ -39,7 +59,7 @@ class CompanyController extends Controller $company = Company::where("user_id", Auth::user()->id)->first(); if (!$company) { - return response()->json(['message'=>'company for company_prof not found'],200); + return response()->json(['success'=> false, 'error'=>'Company not found'], 404); } //validaating file types $validator = Validator::make($request->all(), [ @@ -47,7 +67,7 @@ class CompanyController extends Controller ]); if($validator->fails()) { - return response()->json(['message'=>'Incorrect format'],200); + return response()->json(['success'=> false, 'error'=>'Incorrect format'], 400); } if($file = $request->file('company_profile')) //company profile picture @@ -65,7 +85,7 @@ class CompanyController extends Controller $company->company_profile = $unique_name. '.' .$ext; //update database } //end if $company->save(); - return response()->json(['company'=>$company],200); + return response()->json(['success'=> true, 'message'=>'Company profile picture uploaded successfully'],200); }//end of companyProfile() public function regCert(Request $request) @@ -73,7 +93,7 @@ class CompanyController extends Controller $company = Company::where("user_id", Auth::user()->id)->first(); if (!$company) { - return response()->json(['message'=>'Company not found'], 404); + return response()->json(['success'=> false, 'error'=>'Company not found'], 404); } //validating file types @@ -81,7 +101,7 @@ class CompanyController extends Controller 'reg_cert' => 'mimes:jpg,jpeg,bmp,png,gif,svg,pdf' ]); if($validator->fails()){ - return response()->json(['message'=>'Incorrect format'],200); + return response()->json(['success'=> false, 'error'=>'Incorrect format'], 400); } if($request->hasFile('reg_cert')) //Registration Certificate upload @@ -99,7 +119,7 @@ class CompanyController extends Controller $company->reg_cert = $unique_name. '.' .$ext; //this updates database }//end if $company->save(); - return response()->json(['company'=>$company],200); + return response()->json(['success'=> true, 'message'=>'Registration Certificate uploaded successfully'], 200); }//end regCert() }//end of class \ No newline at end of file diff --git a/app/Http/Controllers/DeliveryInfoController.php b/app/Http/Controllers/DeliveryInfoController.php new file mode 100644 index 0000000..aec2934 --- /dev/null +++ b/app/Http/Controllers/DeliveryInfoController.php @@ -0,0 +1,106 @@ +company())->get(); + return response()->json($deliveryinfo, 200); + } + + /** + * Display the specified delivery-info. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function show(Deliveryinfo $id) + { + $deliveryinfo = Deliveryinfo::where('com_id', Auth::user()->company())->where('id', $id)->firstOrFail(); + return response()->json($deliveryinfo, 200); + } + + /** + * Store a newly delivery-info in storage. + * + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\Response + */ + public function store(Request $request) + { + $user = Auth::user(); + + $deliveryinfo = new Deliveryinfo; + $deliveryinfo->branch = $request->input('branch'); + $deliveryinfo->deli_info = $request->input('deli_info'); + $deliveryinfo->address = $request->input('address'); + $deliveryinfo->city = $request->input('city'); + $deliveryinfo->postcode = $request->input('postcode'); + $deliveryinfo->state = $request->input('state'); + $deliveryinfo->country = $request->input('country'); + $deliveryinfo->contact_person = $request->input('contact_person'); + $deliveryinfo->contact_person_no = $request->input('contact_person_no'); + $deliveryinfo->com_id = $user->company(); + $deliveryinfo->save(); + + return response()->json(['deliveryinfo'=>$deliveryinfo],201); + } + + /** + * Update the delivery-info. + * + * @param \Illuminate\Http\Request $request + * @param int $id + * @return \Illuminate\Http\Response + */ + public function update(Request $request, $id) + { + $deliveryinfo = Deliveryinfo::where('com_id', Auth::user()->company())->where('id', $id)->firstOrFail(); + + if (!$deliveryinfo) + { + return response()->json(['message'=>'Access Denied!'], 404); + } + + $deliveryinfo->branch = $request->input('branch'); + $deliveryinfo->deli_info = $request->input('deli_info'); + $deliveryinfo->address = $request->input('address'); + $deliveryinfo->city = $request->input('city'); + $deliveryinfo->postcode = $request->input('postcode'); + $deliveryinfo->state = $request->input('state'); + $deliveryinfo->country = $request->input('country'); + $deliveryinfo->contact_person = $request->input('contact_person'); + $deliveryinfo->contact_person_no = $request->input('contact_person_no'); + $deliveryinfo->com_id = $user->company(); + $deliveryinfo->save(); + + return response()->json(['deliveryinfo'=>$deliveryinfo],200); + + } + + /** + * Remove the delivery-info. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function destroy(Deliveryinfo $id) + { + $deliveryinfo = Deliveryinfo::where('com_id', Auth::user()->company())->where('id', $id)->firstOrFail(); + + if (!$deliveryinfo) + { + return response()->json(['message'=>'Access Denied!'], 404); + } + + $deliveryinfo->delete($id); + + return response()->json($deliveryinfo, 204); + } +} diff --git a/app/Http/Controllers/SoController.php b/app/Http/Controllers/SoController.php index 914423e..dd505d9 100644 --- a/app/Http/Controllers/SoController.php +++ b/app/Http/Controllers/SoController.php @@ -8,24 +8,14 @@ use App\Soitem; class SoController extends Controller { - /** - * Display a listing of the resource. - * - * @return \Illuminate\Http\Response - */ - // get the list of the shipping order - public function index() - { - return view('welcome'); - } - + /** * Display a listing of the resource. * * @return \Illuminate\Http\Response */ //get the shipping order - public function showso($so_id) + public function show($so_id) { $so_id = So::find($so_id); return response()->json($so_id, 200); diff --git a/app/Http/Controllers/WarehousearrangementController.php b/app/Http/Controllers/WarehousearrangementController.php index adbdd6c..025591d 100644 --- a/app/Http/Controllers/WarehousearrangementController.php +++ b/app/Http/Controllers/WarehousearrangementController.php @@ -269,7 +269,7 @@ class WarehousearrangementController extends Controller //decision-type $decisionitem = new Decisionitem; $decisionitem->decision_id = $decision->id; - $decisionitem->wi_id = $warehouseitems->id; + $decisionitem->warehouseitem_id = $warehouseitems->id; $decisionitem->num_of_item = $request->input('num_of_item'); $decisionitem->save(); diff --git a/config/database.php b/config/database.php index 62f4632..da6c3fe 100644 --- a/config/database.php +++ b/config/database.php @@ -53,6 +53,21 @@ return [ 'strict' => true, 'engine' => null, ], + + 'testing' => [ + 'driver' => 'mysql', + 'host' => env('DB_HOST', '127.0.0.1'), + 'port' => env('DB_PORT', '3306'), + 'database' => 'testingizyim', + 'username' => 'root', + 'password' => '', + 'unix_socket' => env('DB_SOCKET', ''), + 'charset' => 'utf8mb4', + 'collation' => 'utf8mb4_unicode_ci', + 'prefix' => '', + 'strict' => true, + 'engine' => null, + ], 'testing' => [ 'driver' => 'mysql', diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index b00fc3b..69ecb71 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -15,6 +15,9 @@ use Faker\Generator as Faker; $factory->define(App\User::class, function (Faker $faker) { return [ + 'name' => $faker->name, + 'email' => $faker->unique()->safeEmail, + 'password' => bcrypt(str_random(10)), // secret 'phone' => $faker->unique()->randomDigit, 'password' => '$2y$10$TKh8H1.PfQx37YgCzwiKb.KjNyWgaHb9cbcoQgdIVFlYg7B77UdFm', // secret 'remember_token' => str_random(10), diff --git a/database/migrations/2018_04_25_024318_create_deliveryinfos_table.php b/database/migrations/2018_04_25_024318_create_deliveryinfos_table.php new file mode 100644 index 0000000..c8dfc96 --- /dev/null +++ b/database/migrations/2018_04_25_024318_create_deliveryinfos_table.php @@ -0,0 +1,43 @@ +increments('id'); + $table->string('branch'); + $table->string('deli_info'); + $table->string('address'); + $table->string('city'); + $table->integer('postcode'); + $table->string('state'); + $table->string('country'); + $table->string('contact_person'); + $table->integer('contact_person_no'); + $table->timestamps(); + + + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('deliveryinfos'); + } +} diff --git a/database/migrations/2018_04_25_084609_change_email_to_mobile_from_user.php b/database/migrations/2018_04_25_084609_change_email_to_mobile_from_user.php index b8f59c1..5ce9b11 100644 --- a/database/migrations/2018_04_25_084609_change_email_to_mobile_from_user.php +++ b/database/migrations/2018_04_25_084609_change_email_to_mobile_from_user.php @@ -25,6 +25,6 @@ class ChangeEmailToMobileFromUser extends Migration */ public function down() { - $table->renameColumn('phone', 'email'); + //$table->renameColumn('phone', 'email'); } } diff --git a/database/migrations/2018_06_11_033330_add_column_to_table_delivery_info.php b/database/migrations/2018_06_11_033330_add_column_to_table_delivery_info.php new file mode 100644 index 0000000..adc10de --- /dev/null +++ b/database/migrations/2018_06_11_033330_add_column_to_table_delivery_info.php @@ -0,0 +1,37 @@ +unsignedInteger('com_id');//FK wrn id + $table->foreign('com_id') + ->references('id')->on('companies') + ->onDelete('cascade'); + + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('deliveryinfos', function (Blueprint $table) { + // + }); + } +} diff --git a/database/migrations/2018_06_28_083352_rename_wi_id_to_warehouseitem_id_to_decisonitems_table.php b/database/migrations/2018_06_28_083352_rename_wi_id_to_warehouseitem_id_to_decisonitems_table.php new file mode 100644 index 0000000..070e033 --- /dev/null +++ b/database/migrations/2018_06_28_083352_rename_wi_id_to_warehouseitem_id_to_decisonitems_table.php @@ -0,0 +1,35 @@ +renameColumn('wi_id', 'warehouseitem_id'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('decisionitems', function (Blueprint $table) { + + $table->renameColumn('warehouseitem_id', 'wi_id'); + + }); + } +} diff --git a/database/seeds/CompanySeeder.php b/database/seeds/CompanySeeder.php new file mode 100644 index 0000000..b35e062 --- /dev/null +++ b/database/seeds/CompanySeeder.php @@ -0,0 +1,35 @@ +insert([ + + 'id' => '999', + 'company_name'=>'testing', + 'registration_no'=>'testing', + 'tax_no'=>'testing', + 'tel_no'=>'12345', + 'fax'=>'12345', + 'address'=>'testing', + 'city'=>'testing', + 'postcode'=>'12345', + 'state'=>'testing', + 'country'=>'testing', + 'contact_person'=>'testing', + 'created_at' => Carbon::now()->format('Y-m-d H:i:s'), + 'updated_at' => Carbon::now()->format('Y-m-d H:i:s'), + 'user_id' => '2' + + ]); + } +} diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index b2b7592..0f76102 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -17,5 +17,7 @@ class DatabaseSeeder extends Seeder $this->call(SoitemSeeder::class); $this->call(WarehousearrSeeder::class); $this->call(WarehouseitemSeeder::class); + $this->call(DeliveryInfoSeeder::class); + $this->call(CompanySeeder::class); } } diff --git a/database/seeds/DeliveryInfoSeeder.php b/database/seeds/DeliveryInfoSeeder.php new file mode 100644 index 0000000..88638fb --- /dev/null +++ b/database/seeds/DeliveryInfoSeeder.php @@ -0,0 +1,33 @@ +insert([ + + 'id' => '999', + 'branch' => 'Testing', + 'deli_info' => 'Testing', + 'address' => 'Testing', + 'city' => 'Test', + 'postcode' => '12345', + 'state' => 'Testing', + 'country' => 'Testing', + 'contact_person' => 'Testing', + 'contact_person_no' => '12345', + 'created_at' => Carbon::now()->format('Y-m-d H:i:s'), + 'updated_at' => Carbon::now()->format('Y-m-d H:i:s'), + 'com_id' => '999' + + ]); + } +} diff --git a/package-lock.json b/package-lock.json index 460046c..054cf67 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,14 +14,24 @@ "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=", "dev": true, "requires": { +<<<<<<< HEAD "mime-types": "~2.1.18", +======= + "mime-types": "2.1.18", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "negotiator": "0.6.1" } }, "acorn": { +<<<<<<< HEAD "version": "5.5.3", "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz", "integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ==", +======= + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.6.0.tgz", + "integrity": "sha512-QatFQ4C0n+PLqemyC6zXEv04tSqRR0hRqe+uGKPEVgKe2G8kl8wJvHzRYWwz6vqqEqt6idPVMFojZ4P1zlyAzQ==", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "dev": true }, "acorn-dynamic-import": { @@ -30,7 +40,11 @@ "integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=", "dev": true, "requires": { +<<<<<<< HEAD "acorn": "^4.0.3" +======= + "acorn": "4.0.13" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "acorn": { @@ -47,6 +61,7 @@ "integrity": "sha512-958oaHHVEXMvsY7v7cC5gEkNIcoaAVIhZ4mBReYVZJOTP9IgKmzLjIOhTtzpLMu+qriXvLsVjJ155EeInp45IQ==", "dev": true, "requires": { +<<<<<<< HEAD "assert": "^1.3.0", "camelcase": "^1.2.1", "loader-utils": "^1.1.0", @@ -54,6 +69,15 @@ "lodash.defaults": "^3.1.2", "object-path": "^0.9.2", "regex-parser": "^2.2.9" +======= + "assert": "1.4.1", + "camelcase": "1.2.1", + "loader-utils": "1.1.0", + "lodash.assign": "4.2.0", + "lodash.defaults": "3.1.2", + "object-path": "0.9.2", + "regex-parser": "2.2.9" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "camelcase": { @@ -62,14 +86,28 @@ "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", "dev": true }, +<<<<<<< HEAD +======= + "lodash.assign": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", + "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=", + "dev": true + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "lodash.defaults": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-3.1.2.tgz", "integrity": "sha1-xzCLGNv4vJNy1wGnNJPGEZK9Liw=", "dev": true, "requires": { +<<<<<<< HEAD "lodash.assign": "^3.0.0", "lodash.restparam": "^3.0.0" +======= + "lodash.assign": "3.2.0", + "lodash.restparam": "3.6.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "lodash.assign": { @@ -78,9 +116,15 @@ "integrity": "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=", "dev": true, "requires": { +<<<<<<< HEAD "lodash._baseassign": "^3.0.0", "lodash._createassigner": "^3.0.0", "lodash.keys": "^3.0.0" +======= + "lodash._baseassign": "3.2.0", + "lodash._createassigner": "3.1.1", + "lodash.keys": "3.1.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -93,10 +137,17 @@ "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "dev": true, "requires": { +<<<<<<< HEAD "co": "^4.6.0", "fast-deep-equal": "^1.0.0", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.3.0" +======= + "co": "4.6.0", + "fast-deep-equal": "1.1.0", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "ajv-keywords": { @@ -111,6 +162,7 @@ "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, "requires": { +<<<<<<< HEAD "kind-of": "^3.0.2", "longest": "^1.0.1", "repeat-string": "^1.5.2" @@ -125,6 +177,11 @@ "is-buffer": "^1.1.5" } } +======= + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "alphanum-sort": { @@ -161,6 +218,7 @@ "dev": true }, "ansi-styles": { +<<<<<<< HEAD "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", @@ -168,6 +226,12 @@ "requires": { "color-convert": "^1.9.0" } +======= + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "dev": true +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "ansi-wrap": { "version": "0.1.0", @@ -175,6 +239,7 @@ "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=", "dev": true }, +<<<<<<< HEAD "anymatch": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", @@ -185,6 +250,8 @@ "normalize-path": "^2.1.1" } }, +======= +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", @@ -197,7 +264,11 @@ "integrity": "sha1-nNnABpV+vpX62tW9YJiUKoE3N/Y=", "dev": true, "requires": { +<<<<<<< HEAD "file-type": "^3.1.0" +======= + "file-type": "3.9.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "file-type": { @@ -209,6 +280,7 @@ } }, "are-we-there-yet": { +<<<<<<< HEAD "version": "1.1.4", "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz", "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", @@ -216,6 +288,15 @@ "requires": { "delegates": "^1.0.0", "readable-stream": "^2.0.6" +======= + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", + "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", + "dev": true, + "requires": { + "delegates": "1.0.0", + "readable-stream": "2.3.6" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "argparse": { @@ -224,6 +305,7 @@ "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "requires": { +<<<<<<< HEAD "sprintf-js": "~1.0.2" } }, @@ -232,6 +314,19 @@ "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", "dev": true +======= + "sprintf-js": "1.0.3" + } + }, + "arr-diff": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", + "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", + "dev": true, + "requires": { + "arr-flatten": "1.1.0" + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "arr-flatten": { "version": "1.1.0", @@ -258,9 +353,15 @@ "dev": true }, "array-flatten": { +<<<<<<< HEAD "version": "2.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz", "integrity": "sha1-Qmu52oQJDBg42BLIFQryCoMx4pY=", +======= + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "dev": true }, "array-includes": { @@ -269,8 +370,13 @@ "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=", "dev": true, "requires": { +<<<<<<< HEAD "define-properties": "^1.1.2", "es-abstract": "^1.7.0" +======= + "define-properties": "1.1.2", + "es-abstract": "1.12.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "array-union": { @@ -279,7 +385,11 @@ "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", "dev": true, "requires": { +<<<<<<< HEAD "array-uniq": "^1.0.1" +======= + "array-uniq": "1.0.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "array-uniq": { @@ -289,9 +399,15 @@ "dev": true }, "array-unique": { +<<<<<<< HEAD "version": "0.3.2", "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", +======= + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", + "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "dev": true }, "asn1": { @@ -306,9 +422,15 @@ "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==", "dev": true, "requires": { +<<<<<<< HEAD "bn.js": "^4.0.0", "inherits": "^2.0.1", "minimalistic-assert": "^1.0.0" +======= + "bn.js": "4.11.8", + "inherits": "2.0.3", + "minimalistic-assert": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "assert": { @@ -339,6 +461,7 @@ "dev": true }, "async": { +<<<<<<< HEAD "version": "2.6.1", "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", @@ -346,6 +469,12 @@ "requires": { "lodash": "^4.17.10" } +======= + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", + "dev": true +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "async-each": { "version": "1.0.1", @@ -383,12 +512,21 @@ "integrity": "sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==", "dev": true, "requires": { +<<<<<<< HEAD "browserslist": "^2.11.3", "caniuse-lite": "^1.0.30000805", "normalize-range": "^0.1.2", "num2fraction": "^1.2.2", "postcss": "^6.0.17", "postcss-value-parser": "^3.2.3" +======= + "browserslist": "2.11.3", + "caniuse-lite": "1.0.30000849", + "normalize-range": "0.1.2", + "num2fraction": "1.2.2", + "postcss": "6.0.22", + "postcss-value-parser": "3.3.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "aws-sign2": { @@ -409,8 +547,13 @@ "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=", "dev": true, "requires": { +<<<<<<< HEAD "follow-redirects": "^1.3.0", "is-buffer": "^1.1.5" +======= + "follow-redirects": "1.5.0", + "is-buffer": "1.1.6" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-code-frame": { @@ -419,6 +562,7 @@ "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.3", "esutils": "^2.0.2", "js-tokens": "^3.0.2" @@ -449,6 +593,11 @@ "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", "dev": true } +======= + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-core": { @@ -457,6 +606,7 @@ "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==", "dev": true, "requires": { +<<<<<<< HEAD "babel-code-frame": "^6.26.0", "babel-generator": "^6.26.0", "babel-helpers": "^6.24.1", @@ -491,6 +641,33 @@ "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", +======= + "babel-code-frame": "6.26.0", + "babel-generator": "6.26.1", + "babel-helpers": "6.24.1", + "babel-messages": "6.23.0", + "babel-register": "6.26.0", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "convert-source-map": "1.5.1", + "debug": "2.6.9", + "json5": "0.5.1", + "lodash": "4.17.10", + "minimatch": "3.0.4", + "path-is-absolute": "1.0.1", + "private": "0.1.8", + "slash": "1.0.0", + "source-map": "0.5.7" + }, + "dependencies": { + "convert-source-map": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz", + "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "dev": true } } @@ -501,6 +678,7 @@ "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", "dev": true, "requires": { +<<<<<<< HEAD "babel-messages": "^6.23.0", "babel-runtime": "^6.26.0", "babel-types": "^6.26.0", @@ -516,6 +694,35 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true +======= + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "detect-indent": "4.0.0", + "jsesc": "1.3.0", + "lodash": "4.17.10", + "source-map": "0.5.7", + "trim-right": "1.0.1" + }, + "dependencies": { + "detect-indent": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", + "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", + "dev": true, + "requires": { + "repeating": "2.0.1" + } + }, + "repeating": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", + "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", + "dev": true, + "requires": { + "is-finite": "1.0.2" + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } }, @@ -525,9 +732,15 @@ "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", "dev": true, "requires": { +<<<<<<< HEAD "babel-helper-explode-assignable-expression": "^6.24.1", "babel-runtime": "^6.22.0", "babel-types": "^6.24.1" +======= + "babel-helper-explode-assignable-expression": "6.24.1", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-helper-call-delegate": { @@ -536,10 +749,17 @@ "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=", "dev": true, "requires": { +<<<<<<< HEAD "babel-helper-hoist-variables": "^6.24.1", "babel-runtime": "^6.22.0", "babel-traverse": "^6.24.1", "babel-types": "^6.24.1" +======= + "babel-helper-hoist-variables": "6.24.1", + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-helper-define-map": { @@ -548,10 +768,17 @@ "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=", "dev": true, "requires": { +<<<<<<< HEAD "babel-helper-function-name": "^6.24.1", "babel-runtime": "^6.26.0", "babel-types": "^6.26.0", "lodash": "^4.17.4" +======= + "babel-helper-function-name": "6.24.1", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "lodash": "4.17.10" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-helper-explode-assignable-expression": { @@ -560,9 +787,15 @@ "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", "dev": true, "requires": { +<<<<<<< HEAD "babel-runtime": "^6.22.0", "babel-traverse": "^6.24.1", "babel-types": "^6.24.1" +======= + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-helper-function-name": { @@ -571,11 +804,19 @@ "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", "dev": true, "requires": { +<<<<<<< HEAD "babel-helper-get-function-arity": "^6.24.1", "babel-runtime": "^6.22.0", "babel-template": "^6.24.1", "babel-traverse": "^6.24.1", "babel-types": "^6.24.1" +======= + "babel-helper-get-function-arity": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-helper-get-function-arity": { @@ -584,8 +825,13 @@ "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", "dev": true, "requires": { +<<<<<<< HEAD "babel-runtime": "^6.22.0", "babel-types": "^6.24.1" +======= + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-helper-hoist-variables": { @@ -594,8 +840,13 @@ "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", "dev": true, "requires": { +<<<<<<< HEAD "babel-runtime": "^6.22.0", "babel-types": "^6.24.1" +======= + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-helper-optimise-call-expression": { @@ -604,8 +855,13 @@ "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=", "dev": true, "requires": { +<<<<<<< HEAD "babel-runtime": "^6.22.0", "babel-types": "^6.24.1" +======= + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-helper-regex": { @@ -614,9 +870,15 @@ "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=", "dev": true, "requires": { +<<<<<<< HEAD "babel-runtime": "^6.26.0", "babel-types": "^6.26.0", "lodash": "^4.17.4" +======= + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "lodash": "4.17.10" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-helper-remap-async-to-generator": { @@ -625,11 +887,19 @@ "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", "dev": true, "requires": { +<<<<<<< HEAD "babel-helper-function-name": "^6.24.1", "babel-runtime": "^6.22.0", "babel-template": "^6.24.1", "babel-traverse": "^6.24.1", "babel-types": "^6.24.1" +======= + "babel-helper-function-name": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-helper-replace-supers": { @@ -638,12 +908,21 @@ "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=", "dev": true, "requires": { +<<<<<<< HEAD "babel-helper-optimise-call-expression": "^6.24.1", "babel-messages": "^6.23.0", "babel-runtime": "^6.22.0", "babel-template": "^6.24.1", "babel-traverse": "^6.24.1", "babel-types": "^6.24.1" +======= + "babel-helper-optimise-call-expression": "6.24.1", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-helpers": { @@ -652,8 +931,13 @@ "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", "dev": true, "requires": { +<<<<<<< HEAD "babel-runtime": "^6.22.0", "babel-template": "^6.24.1" +======= + "babel-runtime": "6.26.0", + "babel-template": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-loader": { @@ -662,9 +946,15 @@ "integrity": "sha512-/hbyEvPzBJuGpk9o80R0ZyTej6heEOr59GoEUtn8qFKbnx4cJm9FWES6J/iv644sYgrtVw9JJQkjaLW/bqb5gw==", "dev": true, "requires": { +<<<<<<< HEAD "find-cache-dir": "^1.0.0", "loader-utils": "^1.0.2", "mkdirp": "^0.5.1" +======= + "find-cache-dir": "1.0.0", + "loader-utils": "1.1.0", + "mkdirp": "0.5.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-messages": { @@ -673,7 +963,11 @@ "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", "dev": true, "requires": { +<<<<<<< HEAD "babel-runtime": "^6.22.0" +======= + "babel-runtime": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-plugin-check-es2015-constants": { @@ -682,7 +976,11 @@ "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=", "dev": true, "requires": { +<<<<<<< HEAD "babel-runtime": "^6.22.0" +======= + "babel-runtime": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-plugin-syntax-async-functions": { @@ -715,9 +1013,15 @@ "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", "dev": true, "requires": { +<<<<<<< HEAD "babel-helper-remap-async-to-generator": "^6.24.1", "babel-plugin-syntax-async-functions": "^6.8.0", "babel-runtime": "^6.22.0" +======= + "babel-helper-remap-async-to-generator": "6.24.1", + "babel-plugin-syntax-async-functions": "6.13.0", + "babel-runtime": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-plugin-transform-es2015-arrow-functions": { @@ -726,7 +1030,11 @@ "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=", "dev": true, "requires": { +<<<<<<< HEAD "babel-runtime": "^6.22.0" +======= + "babel-runtime": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-plugin-transform-es2015-block-scoped-functions": { @@ -735,7 +1043,11 @@ "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=", "dev": true, "requires": { +<<<<<<< HEAD "babel-runtime": "^6.22.0" +======= + "babel-runtime": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-plugin-transform-es2015-block-scoping": { @@ -744,11 +1056,19 @@ "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=", "dev": true, "requires": { +<<<<<<< HEAD "babel-runtime": "^6.26.0", "babel-template": "^6.26.0", "babel-traverse": "^6.26.0", "babel-types": "^6.26.0", "lodash": "^4.17.4" +======= + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "lodash": "4.17.10" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-plugin-transform-es2015-classes": { @@ -757,6 +1077,7 @@ "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=", "dev": true, "requires": { +<<<<<<< HEAD "babel-helper-define-map": "^6.24.1", "babel-helper-function-name": "^6.24.1", "babel-helper-optimise-call-expression": "^6.24.1", @@ -766,6 +1087,17 @@ "babel-template": "^6.24.1", "babel-traverse": "^6.24.1", "babel-types": "^6.24.1" +======= + "babel-helper-define-map": "6.26.0", + "babel-helper-function-name": "6.24.1", + "babel-helper-optimise-call-expression": "6.24.1", + "babel-helper-replace-supers": "6.24.1", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-plugin-transform-es2015-computed-properties": { @@ -774,8 +1106,13 @@ "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=", "dev": true, "requires": { +<<<<<<< HEAD "babel-runtime": "^6.22.0", "babel-template": "^6.24.1" +======= + "babel-runtime": "6.26.0", + "babel-template": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-plugin-transform-es2015-destructuring": { @@ -784,7 +1121,11 @@ "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=", "dev": true, "requires": { +<<<<<<< HEAD "babel-runtime": "^6.22.0" +======= + "babel-runtime": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-plugin-transform-es2015-duplicate-keys": { @@ -793,8 +1134,13 @@ "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=", "dev": true, "requires": { +<<<<<<< HEAD "babel-runtime": "^6.22.0", "babel-types": "^6.24.1" +======= + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-plugin-transform-es2015-for-of": { @@ -803,7 +1149,11 @@ "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=", "dev": true, "requires": { +<<<<<<< HEAD "babel-runtime": "^6.22.0" +======= + "babel-runtime": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-plugin-transform-es2015-function-name": { @@ -812,9 +1162,15 @@ "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=", "dev": true, "requires": { +<<<<<<< HEAD "babel-helper-function-name": "^6.24.1", "babel-runtime": "^6.22.0", "babel-types": "^6.24.1" +======= + "babel-helper-function-name": "6.24.1", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-plugin-transform-es2015-literals": { @@ -823,7 +1179,11 @@ "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=", "dev": true, "requires": { +<<<<<<< HEAD "babel-runtime": "^6.22.0" +======= + "babel-runtime": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-plugin-transform-es2015-modules-amd": { @@ -832,9 +1192,15 @@ "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=", "dev": true, "requires": { +<<<<<<< HEAD "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1", "babel-runtime": "^6.22.0", "babel-template": "^6.24.1" +======= + "babel-plugin-transform-es2015-modules-commonjs": "6.26.2", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-plugin-transform-es2015-modules-commonjs": { @@ -843,10 +1209,17 @@ "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==", "dev": true, "requires": { +<<<<<<< HEAD "babel-plugin-transform-strict-mode": "^6.24.1", "babel-runtime": "^6.26.0", "babel-template": "^6.26.0", "babel-types": "^6.26.0" +======= + "babel-plugin-transform-strict-mode": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-types": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-plugin-transform-es2015-modules-systemjs": { @@ -855,9 +1228,15 @@ "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=", "dev": true, "requires": { +<<<<<<< HEAD "babel-helper-hoist-variables": "^6.24.1", "babel-runtime": "^6.22.0", "babel-template": "^6.24.1" +======= + "babel-helper-hoist-variables": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-plugin-transform-es2015-modules-umd": { @@ -866,9 +1245,15 @@ "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=", "dev": true, "requires": { +<<<<<<< HEAD "babel-plugin-transform-es2015-modules-amd": "^6.24.1", "babel-runtime": "^6.22.0", "babel-template": "^6.24.1" +======= + "babel-plugin-transform-es2015-modules-amd": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-plugin-transform-es2015-object-super": { @@ -877,8 +1262,13 @@ "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=", "dev": true, "requires": { +<<<<<<< HEAD "babel-helper-replace-supers": "^6.24.1", "babel-runtime": "^6.22.0" +======= + "babel-helper-replace-supers": "6.24.1", + "babel-runtime": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-plugin-transform-es2015-parameters": { @@ -887,12 +1277,21 @@ "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=", "dev": true, "requires": { +<<<<<<< HEAD "babel-helper-call-delegate": "^6.24.1", "babel-helper-get-function-arity": "^6.24.1", "babel-runtime": "^6.22.0", "babel-template": "^6.24.1", "babel-traverse": "^6.24.1", "babel-types": "^6.24.1" +======= + "babel-helper-call-delegate": "6.24.1", + "babel-helper-get-function-arity": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-plugin-transform-es2015-shorthand-properties": { @@ -901,8 +1300,13 @@ "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=", "dev": true, "requires": { +<<<<<<< HEAD "babel-runtime": "^6.22.0", "babel-types": "^6.24.1" +======= + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-plugin-transform-es2015-spread": { @@ -911,7 +1315,11 @@ "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", "dev": true, "requires": { +<<<<<<< HEAD "babel-runtime": "^6.22.0" +======= + "babel-runtime": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-plugin-transform-es2015-sticky-regex": { @@ -920,9 +1328,15 @@ "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", "dev": true, "requires": { +<<<<<<< HEAD "babel-helper-regex": "^6.24.1", "babel-runtime": "^6.22.0", "babel-types": "^6.24.1" +======= + "babel-helper-regex": "6.26.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-plugin-transform-es2015-template-literals": { @@ -931,7 +1345,11 @@ "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=", "dev": true, "requires": { +<<<<<<< HEAD "babel-runtime": "^6.22.0" +======= + "babel-runtime": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-plugin-transform-es2015-typeof-symbol": { @@ -940,7 +1358,11 @@ "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=", "dev": true, "requires": { +<<<<<<< HEAD "babel-runtime": "^6.22.0" +======= + "babel-runtime": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-plugin-transform-es2015-unicode-regex": { @@ -949,9 +1371,15 @@ "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", "dev": true, "requires": { +<<<<<<< HEAD "babel-helper-regex": "^6.24.1", "babel-runtime": "^6.22.0", "regexpu-core": "^2.0.0" +======= + "babel-helper-regex": "6.26.0", + "babel-runtime": "6.26.0", + "regexpu-core": "2.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-plugin-transform-exponentiation-operator": { @@ -960,9 +1388,15 @@ "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", "dev": true, "requires": { +<<<<<<< HEAD "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1", "babel-plugin-syntax-exponentiation-operator": "^6.8.0", "babel-runtime": "^6.22.0" +======= + "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1", + "babel-plugin-syntax-exponentiation-operator": "6.13.0", + "babel-runtime": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-plugin-transform-object-rest-spread": { @@ -971,8 +1405,13 @@ "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=", "dev": true, "requires": { +<<<<<<< HEAD "babel-plugin-syntax-object-rest-spread": "^6.8.0", "babel-runtime": "^6.26.0" +======= + "babel-plugin-syntax-object-rest-spread": "6.13.0", + "babel-runtime": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-plugin-transform-regenerator": { @@ -981,7 +1420,11 @@ "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=", "dev": true, "requires": { +<<<<<<< HEAD "regenerator-transform": "^0.10.0" +======= + "regenerator-transform": "0.10.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-plugin-transform-runtime": { @@ -990,7 +1433,11 @@ "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=", "dev": true, "requires": { +<<<<<<< HEAD "babel-runtime": "^6.22.0" +======= + "babel-runtime": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-plugin-transform-strict-mode": { @@ -999,8 +1446,13 @@ "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", "dev": true, "requires": { +<<<<<<< HEAD "babel-runtime": "^6.22.0", "babel-types": "^6.24.1" +======= + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-preset-env": { @@ -1009,6 +1461,7 @@ "integrity": "sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==", "dev": true, "requires": { +<<<<<<< HEAD "babel-plugin-check-es2015-constants": "^6.22.0", "babel-plugin-syntax-trailing-function-commas": "^6.22.0", "babel-plugin-transform-async-to-generator": "^6.22.0", @@ -1039,6 +1492,38 @@ "browserslist": "^3.2.6", "invariant": "^2.2.2", "semver": "^5.3.0" +======= + "babel-plugin-check-es2015-constants": "6.22.0", + "babel-plugin-syntax-trailing-function-commas": "6.22.0", + "babel-plugin-transform-async-to-generator": "6.24.1", + "babel-plugin-transform-es2015-arrow-functions": "6.22.0", + "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0", + "babel-plugin-transform-es2015-block-scoping": "6.26.0", + "babel-plugin-transform-es2015-classes": "6.24.1", + "babel-plugin-transform-es2015-computed-properties": "6.24.1", + "babel-plugin-transform-es2015-destructuring": "6.23.0", + "babel-plugin-transform-es2015-duplicate-keys": "6.24.1", + "babel-plugin-transform-es2015-for-of": "6.23.0", + "babel-plugin-transform-es2015-function-name": "6.24.1", + "babel-plugin-transform-es2015-literals": "6.22.0", + "babel-plugin-transform-es2015-modules-amd": "6.24.1", + "babel-plugin-transform-es2015-modules-commonjs": "6.26.2", + "babel-plugin-transform-es2015-modules-systemjs": "6.24.1", + "babel-plugin-transform-es2015-modules-umd": "6.24.1", + "babel-plugin-transform-es2015-object-super": "6.24.1", + "babel-plugin-transform-es2015-parameters": "6.24.1", + "babel-plugin-transform-es2015-shorthand-properties": "6.24.1", + "babel-plugin-transform-es2015-spread": "6.22.0", + "babel-plugin-transform-es2015-sticky-regex": "6.24.1", + "babel-plugin-transform-es2015-template-literals": "6.22.0", + "babel-plugin-transform-es2015-typeof-symbol": "6.23.0", + "babel-plugin-transform-es2015-unicode-regex": "6.24.1", + "babel-plugin-transform-exponentiation-operator": "6.24.1", + "babel-plugin-transform-regenerator": "6.26.0", + "browserslist": "3.2.8", + "invariant": "2.2.4", + "semver": "5.5.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "browserslist": { @@ -1047,8 +1532,13 @@ "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==", "dev": true, "requires": { +<<<<<<< HEAD "caniuse-lite": "^1.0.30000844", "electron-to-chromium": "^1.3.47" +======= + "caniuse-lite": "1.0.30000849", + "electron-to-chromium": "1.3.48" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -1059,6 +1549,7 @@ "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", "dev": true, "requires": { +<<<<<<< HEAD "babel-core": "^6.26.0", "babel-runtime": "^6.26.0", "core-js": "^2.5.0", @@ -1066,6 +1557,15 @@ "lodash": "^4.17.4", "mkdirp": "^0.5.1", "source-map-support": "^0.4.15" +======= + "babel-core": "6.26.3", + "babel-runtime": "6.26.0", + "core-js": "2.5.7", + "home-or-tmp": "2.0.0", + "lodash": "4.17.10", + "mkdirp": "0.5.1", + "source-map-support": "0.4.18" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-runtime": { @@ -1074,8 +1574,13 @@ "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "dev": true, "requires": { +<<<<<<< HEAD "core-js": "^2.4.0", "regenerator-runtime": "^0.11.0" +======= + "core-js": "2.5.7", + "regenerator-runtime": "0.11.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-template": { @@ -1084,11 +1589,19 @@ "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", "dev": true, "requires": { +<<<<<<< HEAD "babel-runtime": "^6.26.0", "babel-traverse": "^6.26.0", "babel-types": "^6.26.0", "babylon": "^6.18.0", "lodash": "^4.17.4" +======= + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "lodash": "4.17.10" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-traverse": { @@ -1097,6 +1610,7 @@ "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", "dev": true, "requires": { +<<<<<<< HEAD "babel-code-frame": "^6.26.0", "babel-messages": "^6.23.0", "babel-runtime": "^6.26.0", @@ -1117,6 +1631,17 @@ "ms": "2.0.0" } } +======= + "babel-code-frame": "6.26.0", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "debug": "2.6.9", + "globals": "9.18.0", + "invariant": "2.2.4", + "lodash": "4.17.10" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babel-types": { @@ -1125,10 +1650,17 @@ "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", "dev": true, "requires": { +<<<<<<< HEAD "babel-runtime": "^6.26.0", "esutils": "^2.0.2", "lodash": "^4.17.4", "to-fast-properties": "^1.0.3" +======= + "babel-runtime": "6.26.0", + "esutils": "2.0.2", + "lodash": "4.17.10", + "to-fast-properties": "1.0.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "babylon": { @@ -1149,6 +1681,7 @@ "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", "dev": true, "requires": { +<<<<<<< HEAD "cache-base": "^1.0.1", "class-utils": "^0.3.5", "component-emitter": "^1.2.1", @@ -1156,6 +1689,15 @@ "isobject": "^3.0.1", "mixin-deep": "^1.2.0", "pascalcase": "^0.1.1" +======= + "cache-base": "1.0.1", + "class-utils": "0.3.6", + "component-emitter": "1.2.1", + "define-property": "1.0.0", + "isobject": "3.0.1", + "mixin-deep": "1.3.1", + "pascalcase": "0.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "define-property": { @@ -1164,7 +1706,11 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { +<<<<<<< HEAD "is-descriptor": "^1.0.0" +======= + "is-descriptor": "1.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "is-accessor-descriptor": { @@ -1173,7 +1719,11 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { +<<<<<<< HEAD "kind-of": "^6.0.0" +======= + "kind-of": "6.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "is-data-descriptor": { @@ -1182,7 +1732,11 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { +<<<<<<< HEAD "kind-of": "^6.0.0" +======= + "kind-of": "6.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "is-descriptor": { @@ -1191,10 +1745,29 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { +<<<<<<< HEAD "is-accessor-descriptor": "^1.0.0", "is-data-descriptor": "^1.0.0", "kind-of": "^6.0.2" } +======= + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "dev": true +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } }, @@ -1217,7 +1790,11 @@ "dev": true, "optional": true, "requires": { +<<<<<<< HEAD "tweetnacl": "^0.14.3" +======= + "tweetnacl": "0.14.5" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "beeper": { @@ -1238,6 +1815,7 @@ "integrity": "sha1-EfjdYfcP/Por3KpbRvXo/t1CIcw=", "dev": true, "requires": { +<<<<<<< HEAD "archive-type": "^3.0.1", "decompress": "^3.0.0", "download": "^4.1.2", @@ -1245,6 +1823,15 @@ "rimraf": "^2.2.6", "tempfile": "^1.0.0", "url-regex": "^3.0.0" +======= + "archive-type": "3.2.0", + "decompress": "3.0.0", + "download": "4.4.3", + "exec-series": "1.0.3", + "rimraf": "2.6.2", + "tempfile": "1.1.1", + "url-regex": "3.2.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "tempfile": { @@ -1253,6 +1840,7 @@ "integrity": "sha1-W8xOrsxKsscH2LwR2ZzMmiyyh/I=", "dev": true, "requires": { +<<<<<<< HEAD "os-tmpdir": "^1.0.0", "uuid": "^2.0.1" } @@ -1262,6 +1850,11 @@ "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=", "dev": true +======= + "os-tmpdir": "1.0.2", + "uuid": "2.0.3" + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } }, @@ -1271,7 +1864,11 @@ "integrity": "sha1-hvjm9CU4k99g3DFpV/WvAqywWTA=", "dev": true, "requires": { +<<<<<<< HEAD "executable": "^1.0.0" +======= + "executable": "1.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "bin-version": { @@ -1280,7 +1877,11 @@ "integrity": "sha1-nrSY7m/Xb3q5p8FgQ2+JV5Q1144=", "dev": true, "requires": { +<<<<<<< HEAD "find-versions": "^1.0.0" +======= + "find-versions": "1.2.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "bin-version-check": { @@ -1289,10 +1890,17 @@ "integrity": "sha1-5OXfKQuQaffRETJAMe/BP90RpbA=", "dev": true, "requires": { +<<<<<<< HEAD "bin-version": "^1.0.0", "minimist": "^1.1.0", "semver": "^4.0.3", "semver-truncate": "^1.0.0" +======= + "bin-version": "1.0.4", + "minimist": "1.2.0", + "semver": "4.3.6", + "semver-truncate": "1.1.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "minimist": { @@ -1315,12 +1923,21 @@ "integrity": "sha1-Z9MwYmLksaXy+I7iNGT2plVneus=", "dev": true, "requires": { +<<<<<<< HEAD "bin-check": "^2.0.0", "bin-version-check": "^2.1.0", "download": "^4.0.0", "each-async": "^1.1.1", "lazy-req": "^1.0.0", "os-filter-obj": "^1.0.0" +======= + "bin-check": "2.0.0", + "bin-version-check": "2.1.0", + "download": "4.4.3", + "each-async": "1.1.1", + "lazy-req": "1.1.0", + "os-filter-obj": "1.0.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "binary-extensions": { @@ -1335,8 +1952,13 @@ "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==", "dev": true, "requires": { +<<<<<<< HEAD "readable-stream": "^2.3.5", "safe-buffer": "^5.1.1" +======= + "readable-stream": "2.3.6", + "safe-buffer": "5.1.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "block-stream": { @@ -1345,7 +1967,11 @@ "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", "dev": true, "requires": { +<<<<<<< HEAD "inherits": "~2.0.0" +======= + "inherits": "2.0.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "bluebird": { @@ -1367,6 +1993,7 @@ "dev": true, "requires": { "bytes": "3.0.0", +<<<<<<< HEAD "content-type": "~1.0.4", "debug": "2.6.9", "depd": "~1.1.1", @@ -1393,6 +2020,17 @@ "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==", "dev": true } +======= + "content-type": "1.0.4", + "debug": "2.6.9", + "depd": "1.1.2", + "http-errors": "1.6.3", + "iconv-lite": "0.4.19", + "on-finished": "2.3.0", + "qs": "6.5.1", + "raw-body": "2.3.2", + "type-is": "1.6.16" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "bonjour": { @@ -1401,12 +2039,29 @@ "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=", "dev": true, "requires": { +<<<<<<< HEAD "array-flatten": "^2.1.0", "deep-equal": "^1.0.1", "dns-equal": "^1.0.0", "dns-txt": "^2.0.2", "multicast-dns": "^6.0.1", "multicast-dns-service-types": "^1.1.0" +======= + "array-flatten": "2.1.1", + "deep-equal": "1.0.1", + "dns-equal": "1.0.0", + "dns-txt": "2.0.2", + "multicast-dns": "6.2.3", + "multicast-dns-service-types": "1.1.0" + }, + "dependencies": { + "array-flatten": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz", + "integrity": "sha1-Qmu52oQJDBg42BLIFQryCoMx4pY=", + "dev": true + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "boolbase": { @@ -1421,7 +2076,11 @@ "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", "dev": true, "requires": { +<<<<<<< HEAD "hoek": "2.x.x" +======= + "hoek": "2.16.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "bootstrap": { @@ -1436,11 +2095,16 @@ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "requires": { +<<<<<<< HEAD "balanced-match": "^1.0.0", +======= + "balanced-match": "1.0.0", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "concat-map": "0.0.1" } }, "braces": { +<<<<<<< HEAD "version": "2.3.2", "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", @@ -1467,6 +2131,16 @@ "is-extendable": "^0.1.0" } } +======= + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", + "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", + "dev": true, + "requires": { + "expand-range": "1.8.2", + "preserve": "0.2.0", + "repeat-element": "1.1.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "brorand": { @@ -1481,12 +2155,21 @@ "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", "dev": true, "requires": { +<<<<<<< HEAD "buffer-xor": "^1.0.3", "cipher-base": "^1.0.0", "create-hash": "^1.1.0", "evp_bytestokey": "^1.0.3", "inherits": "^2.0.1", "safe-buffer": "^5.0.1" +======= + "buffer-xor": "1.0.3", + "cipher-base": "1.0.4", + "create-hash": "1.2.0", + "evp_bytestokey": "1.0.3", + "inherits": "2.0.3", + "safe-buffer": "5.1.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "browserify-cipher": { @@ -1495,9 +2178,15 @@ "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", "dev": true, "requires": { +<<<<<<< HEAD "browserify-aes": "^1.0.4", "browserify-des": "^1.0.0", "evp_bytestokey": "^1.0.0" +======= + "browserify-aes": "1.2.0", + "browserify-des": "1.0.1", + "evp_bytestokey": "1.0.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "browserify-des": { @@ -1506,9 +2195,15 @@ "integrity": "sha512-zy0Cobe3hhgpiOM32Tj7KQ3Vl91m0njwsjzZQK1L+JDf11dzP9qIvjreVinsvXrgfjhStXwUWAEpB9D7Gwmayw==", "dev": true, "requires": { +<<<<<<< HEAD "cipher-base": "^1.0.1", "des.js": "^1.0.0", "inherits": "^2.0.1" +======= + "cipher-base": "1.0.4", + "des.js": "1.0.0", + "inherits": "2.0.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "browserify-rsa": { @@ -1517,8 +2212,13 @@ "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "dev": true, "requires": { +<<<<<<< HEAD "bn.js": "^4.1.0", "randombytes": "^2.0.1" +======= + "bn.js": "4.11.8", + "randombytes": "2.0.6" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "browserify-sign": { @@ -1527,6 +2227,7 @@ "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", "dev": true, "requires": { +<<<<<<< HEAD "bn.js": "^4.1.1", "browserify-rsa": "^4.0.0", "create-hash": "^1.1.0", @@ -1543,6 +2244,15 @@ "dev": true, "requires": { "pako": "~1.0.5" +======= + "bn.js": "4.11.8", + "browserify-rsa": "4.0.1", + "create-hash": "1.2.0", + "create-hmac": "1.1.7", + "elliptic": "6.4.0", + "inherits": "2.0.3", + "parse-asn1": "5.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "browserslist": { @@ -1551,6 +2261,7 @@ "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==", "dev": true, "requires": { +<<<<<<< HEAD "caniuse-lite": "^1.0.30000792", "electron-to-chromium": "^1.3.30" } @@ -1580,6 +2291,26 @@ "version": "0.1.1", "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-0.1.1.tgz", "integrity": "sha1-/+H2dVHdBVc33iUzN7/oU9+rGmo=", +======= + "caniuse-lite": "1.0.30000849", + "electron-to-chromium": "1.3.48" + } + }, + "buffer-alloc": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", + "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", + "dev": true, + "requires": { + "buffer-alloc-unsafe": "1.1.0", + "buffer-fill": "1.0.0" + } + }, + "buffer-alloc-unsafe": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", + "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "dev": true }, "buffer-crc32": { @@ -1589,6 +2320,7 @@ "dev": true }, "buffer-fill": { +<<<<<<< HEAD "version": "0.1.1", "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-0.1.1.tgz", "integrity": "sha512-YgBMBzdRLEfgxJIGu2wrvI2E03tMCFU1p7d1KhB4BOoMN0VxmTFjSyN5JtKt9z8Z9JajMHruI6SE25W96wNv7Q==", @@ -1598,6 +2330,11 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz", "integrity": "sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA==", +======= + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", + "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "dev": true }, "buffer-indexof": { @@ -1612,10 +2349,17 @@ "integrity": "sha1-APFfruOreh3aLN5tkSG//dB7ImI=", "dev": true, "requires": { +<<<<<<< HEAD "file-type": "^3.1.0", "readable-stream": "^2.0.2", "uuid": "^2.0.1", "vinyl": "^1.0.0" +======= + "file-type": "3.9.0", + "readable-stream": "2.3.6", + "uuid": "2.0.3", + "vinyl": "1.2.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "file-type": { @@ -1623,12 +2367,15 @@ "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=", "dev": true +<<<<<<< HEAD }, "uuid": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=", "dev": true +======= +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } }, @@ -1662,6 +2409,7 @@ "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==", "dev": true, "requires": { +<<<<<<< HEAD "bluebird": "^3.5.1", "chownr": "^1.0.1", "glob": "^7.1.2", @@ -1677,6 +2425,37 @@ "y18n": "^4.0.0" }, "dependencies": { +======= + "bluebird": "3.5.1", + "chownr": "1.0.1", + "glob": "7.1.2", + "graceful-fs": "4.1.11", + "lru-cache": "4.1.3", + "mississippi": "2.0.0", + "mkdirp": "0.5.1", + "move-concurrently": "1.0.1", + "promise-inflight": "1.0.1", + "rimraf": "2.6.2", + "ssri": "5.3.0", + "unique-filename": "1.1.0", + "y18n": "4.0.0" + }, + "dependencies": { + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "y18n": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", @@ -1691,6 +2470,7 @@ "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", "dev": true, "requires": { +<<<<<<< HEAD "collection-visit": "^1.0.0", "component-emitter": "^1.2.1", "get-value": "^2.0.6", @@ -1700,6 +2480,25 @@ "to-object-path": "^0.3.0", "union-value": "^1.0.0", "unset-value": "^1.0.0" +======= + "collection-visit": "1.0.0", + "component-emitter": "1.2.1", + "get-value": "2.0.6", + "has-value": "1.0.0", + "isobject": "3.0.1", + "set-value": "2.0.0", + "to-object-path": "0.3.0", + "union-value": "1.0.0", + "unset-value": "1.0.0" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "camel-case": { @@ -1708,8 +2507,13 @@ "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", "dev": true, "requires": { +<<<<<<< HEAD "no-case": "^2.2.0", "upper-case": "^1.1.1" +======= + "no-case": "2.3.2", + "upper-case": "1.1.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "camelcase": { @@ -1724,8 +2528,13 @@ "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "requires": { +<<<<<<< HEAD "camelcase": "^2.0.0", "map-obj": "^1.0.0" +======= + "camelcase": "2.1.1", + "map-obj": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "caniuse-api": { @@ -1734,10 +2543,17 @@ "integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=", "dev": true, "requires": { +<<<<<<< HEAD "browserslist": "^1.3.6", "caniuse-db": "^1.0.30000529", "lodash.memoize": "^4.1.2", "lodash.uniq": "^4.5.0" +======= + "browserslist": "1.7.7", + "caniuse-db": "1.0.30000849", + "lodash.memoize": "4.1.2", + "lodash.uniq": "4.5.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "browserslist": { @@ -1746,13 +2562,26 @@ "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "dev": true, "requires": { +<<<<<<< HEAD "caniuse-db": "^1.0.30000639", "electron-to-chromium": "^1.2.7" } +======= + "caniuse-db": "1.0.30000849", + "electron-to-chromium": "1.3.48" + } + }, + "lodash.memoize": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", + "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", + "dev": true +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } }, "caniuse-db": { +<<<<<<< HEAD "version": "1.0.30000844", "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000844.tgz", "integrity": "sha1-vKV5jNoraTHWgQDC1p5V+zOMu0E=", @@ -1762,6 +2591,17 @@ "version": "1.0.30000844", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000844.tgz", "integrity": "sha512-UpKQE7y6dLHhlv75UyBCRiun34Q+bmxyX3zS+ve9M07YG52tRafOvop9N9d5jC+sikKuG7UMweJKJNts4FVehA==", +======= + "version": "1.0.30000849", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000849.tgz", + "integrity": "sha1-1FL1PX3PuE5/X9NMB3wwrSt7nHs=", + "dev": true + }, + "caniuse-lite": { + "version": "1.0.30000849", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000849.tgz", + "integrity": "sha512-hlkWpyGJTDjjim2m+nvvHiEqt2PZuPdB9yYRbys5P/T179Aq7YgMF6tnM489voTfqMLtJhqmOZNfghxWjjT8jg==", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "dev": true }, "capture-stack-trace": { @@ -1782,10 +2622,17 @@ "integrity": "sha1-/7Im/n78VHKI3GLuPpcHPCEtEDQ=", "dev": true, "requires": { +<<<<<<< HEAD "get-proxy": "^1.0.1", "is-obj": "^1.0.0", "object-assign": "^3.0.0", "tunnel-agent": "^0.4.0" +======= + "get-proxy": "1.1.0", + "is-obj": "1.0.1", + "object-assign": "3.0.0", + "tunnel-agent": "0.4.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "object-assign": { @@ -1802,6 +2649,7 @@ "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", "dev": true, "requires": { +<<<<<<< HEAD "align-text": "^0.1.3", "lazy-cache": "^1.0.3" } @@ -1815,6 +2663,23 @@ "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", "supports-color": "^5.3.0" +======= + "align-text": "0.1.4", + "lazy-cache": "1.0.4" + } + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dev": true, + "requires": { + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "charenc": { @@ -1823,6 +2688,7 @@ "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=", "dev": true }, +<<<<<<< HEAD "chokidar": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz", @@ -1843,6 +2709,8 @@ "upath": "^1.0.0" } }, +======= +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "chownr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz", @@ -1855,8 +2723,13 @@ "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", "dev": true, "requires": { +<<<<<<< HEAD "inherits": "^2.0.1", "safe-buffer": "^5.0.1" +======= + "inherits": "2.0.3", + "safe-buffer": "5.1.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "clap": { @@ -1865,6 +2738,7 @@ "integrity": "sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.3" }, "dependencies": { @@ -1893,6 +2767,9 @@ "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", "dev": true } +======= + "chalk": "1.1.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "class-utils": { @@ -1901,10 +2778,17 @@ "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", "dev": true, "requires": { +<<<<<<< HEAD "arr-union": "^3.1.0", "define-property": "^0.2.5", "isobject": "^3.0.0", "static-extend": "^0.1.1" +======= + "arr-union": "3.1.0", + "define-property": "0.2.5", + "isobject": "3.0.1", + "static-extend": "0.1.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "define-property": { @@ -1913,8 +2797,19 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { +<<<<<<< HEAD "is-descriptor": "^0.1.0" } +======= + "is-descriptor": "0.1.6" + } + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } }, @@ -1924,6 +2819,7 @@ "integrity": "sha1-Ls3xRaujj1R0DybO/Q/z4D4SXWo=", "dev": true, "requires": { +<<<<<<< HEAD "source-map": "0.5.x" }, "dependencies": { @@ -1933,6 +2829,9 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true } +======= + "source-map": "0.5.7" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "cliui": { @@ -1941,6 +2840,7 @@ "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "dev": true, "requires": { +<<<<<<< HEAD "string-width": "^1.0.1", "strip-ansi": "^3.0.1", "wrap-ansi": "^2.0.0" @@ -1955,15 +2855,38 @@ "number-is-nan": "^1.0.0" } }, +======= + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { +<<<<<<< HEAD "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", "strip-ansi": "^3.0.0" +======= + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + }, + "wrap-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "dev": true, + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -1980,10 +2903,17 @@ "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==", "dev": true, "requires": { +<<<<<<< HEAD "for-own": "^1.0.0", "is-plain-object": "^2.0.4", "kind-of": "^6.0.0", "shallow-clone": "^1.0.0" +======= + "for-own": "1.0.0", + "is-plain-object": "2.0.4", + "kind-of": "6.0.2", + "shallow-clone": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "for-own": { @@ -1992,8 +2922,19 @@ "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", "dev": true, "requires": { +<<<<<<< HEAD "for-in": "^1.0.1" } +======= + "for-in": "1.0.2" + } + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "dev": true +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } }, @@ -2015,7 +2956,11 @@ "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=", "dev": true, "requires": { +<<<<<<< HEAD "q": "^1.1.2" +======= + "q": "1.5.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "code-point-at": { @@ -2030,8 +2975,13 @@ "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", "dev": true, "requires": { +<<<<<<< HEAD "map-visit": "^1.0.0", "object-visit": "^1.0.0" +======= + "map-visit": "1.0.0", + "object-visit": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "color": { @@ -2040,9 +2990,15 @@ "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=", "dev": true, "requires": { +<<<<<<< HEAD "clone": "^1.0.2", "color-convert": "^1.3.0", "color-string": "^0.3.0" +======= + "clone": "1.0.4", + "color-convert": "1.9.1", + "color-string": "0.3.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "color-convert": { @@ -2051,7 +3007,11 @@ "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", "dev": true, "requires": { +<<<<<<< HEAD "color-name": "^1.1.1" +======= + "color-name": "1.1.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "color-name": { @@ -2066,7 +3026,11 @@ "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=", "dev": true, "requires": { +<<<<<<< HEAD "color-name": "^1.0.0" +======= + "color-name": "1.1.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "color-support": { @@ -2081,9 +3045,15 @@ "integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=", "dev": true, "requires": { +<<<<<<< HEAD "color": "^0.11.0", "css-color-names": "0.0.4", "has": "^1.0.1" +======= + "color": "0.11.4", + "css-color-names": "0.0.4", + "has": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "colors": { @@ -2098,7 +3068,11 @@ "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", "dev": true, "requires": { +<<<<<<< HEAD "delayed-stream": "~1.0.0" +======= + "delayed-stream": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "commander": { @@ -2125,7 +3099,11 @@ "integrity": "sha1-DRAgq5JLL9tNYnmHXH1tq6a6p6k=", "dev": true, "requires": { +<<<<<<< HEAD "mime-db": ">= 1.33.0 < 2" +======= + "mime-db": "1.33.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "compression": { @@ -2134,6 +3112,7 @@ "integrity": "sha1-qv+81qr4VLROuygDU9WtFlH1mmk=", "dev": true, "requires": { +<<<<<<< HEAD "accepts": "~1.3.4", "bytes": "3.0.0", "compressible": "~2.0.13", @@ -2152,6 +3131,17 @@ "ms": "2.0.0" } }, +======= + "accepts": "1.3.5", + "bytes": "3.0.0", + "compressible": "2.0.13", + "debug": "2.6.9", + "on-headers": "1.0.1", + "safe-buffer": "5.1.1", + "vary": "1.1.2" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "safe-buffer": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", @@ -2167,6 +3157,7 @@ "dev": true }, "concat-stream": { +<<<<<<< HEAD "version": "1.6.2", "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", @@ -2176,6 +3167,50 @@ "inherits": "^2.0.3", "readable-stream": "^2.2.2", "typedarray": "^0.0.6" +======= + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz", + "integrity": "sha1-cIl4Yk2FavQaWnQd790mHadSwmY=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.0.6", + "typedarray": "0.0.6" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "process-nextick-args": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", + "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", + "dev": true + }, + "readable-stream": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", + "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "string_decoder": "0.10.31", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "concatenate": { @@ -2184,7 +3219,11 @@ "integrity": "sha1-C0nW6MQQR9dyjNyNYqCGYjOXtJ8=", "dev": true, "requires": { +<<<<<<< HEAD "globs": "^0.1.2" +======= + "globs": "0.1.4" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "config-chain": { @@ -2193,8 +3232,13 @@ "integrity": "sha1-q6CXR9++TD5w52am5BWG4YWfxvI=", "dev": true, "requires": { +<<<<<<< HEAD "ini": "^1.3.4", "proto-list": "~1.2.1" +======= + "ini": "1.3.5", + "proto-list": "1.2.4" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "connect-history-api-fallback": { @@ -2209,7 +3253,11 @@ "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", "dev": true, "requires": { +<<<<<<< HEAD "date-now": "^0.1.4" +======= + "date-now": "0.1.4" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "console-control-strings": { @@ -2230,7 +3278,11 @@ "integrity": "sha1-WiUEe8dvcwcmZ8jLUsmJiI9JTGM=", "dev": true, "requires": { +<<<<<<< HEAD "bluebird": "^3.1.1" +======= + "bluebird": "3.5.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "constants-browserify": { @@ -2252,9 +3304,15 @@ "dev": true }, "convert-source-map": { +<<<<<<< HEAD "version": "1.5.1", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz", "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=", +======= + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz", + "integrity": "sha1-SCnId+n+SbMWHzvzZziI4gRpmGA=", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "dev": true }, "cookie": { @@ -2275,12 +3333,21 @@ "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==", "dev": true, "requires": { +<<<<<<< HEAD "aproba": "^1.1.1", "fs-write-stream-atomic": "^1.0.8", "iferr": "^0.1.5", "mkdirp": "^0.5.1", "rimraf": "^2.5.4", "run-queue": "^1.0.0" +======= + "aproba": "1.2.0", + "fs-write-stream-atomic": "1.0.10", + "iferr": "0.1.5", + "mkdirp": "0.5.1", + "rimraf": "2.6.2", + "run-queue": "1.0.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "copy-descriptor": { @@ -2290,9 +3357,15 @@ "dev": true }, "core-js": { +<<<<<<< HEAD "version": "2.5.6", "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.6.tgz", "integrity": "sha512-lQUVfQi0aLix2xpyjrrJEvfuYCqPc/HwmTKsC/VNf8q0zsjX7SQZtp4+oRONN5Tsur9GDETPjj+Ub2iDiGZfSQ==", +======= + "version": "2.5.7", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz", + "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "dev": true }, "core-util-is": { @@ -2307,6 +3380,7 @@ "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==", "dev": true, "requires": { +<<<<<<< HEAD "is-directory": "^0.3.1", "js-yaml": "^3.4.3", "minimist": "^1.2.0", @@ -2314,6 +3388,15 @@ "os-homedir": "^1.0.1", "parse-json": "^2.2.0", "require-from-string": "^1.1.0" +======= + "is-directory": "0.3.1", + "js-yaml": "3.7.0", + "minimist": "1.2.0", + "object-assign": "4.1.1", + "os-homedir": "1.0.2", + "parse-json": "2.2.0", + "require-from-string": "1.2.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "minimist": { @@ -2330,8 +3413,13 @@ "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==", "dev": true, "requires": { +<<<<<<< HEAD "bn.js": "^4.1.0", "elliptic": "^6.0.0" +======= + "bn.js": "4.11.8", + "elliptic": "6.4.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "create-error-class": { @@ -2340,7 +3428,11 @@ "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=", "dev": true, "requires": { +<<<<<<< HEAD "capture-stack-trace": "^1.0.0" +======= + "capture-stack-trace": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "create-hash": { @@ -2349,11 +3441,19 @@ "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", "dev": true, "requires": { +<<<<<<< HEAD "cipher-base": "^1.0.1", "inherits": "^2.0.1", "md5.js": "^1.3.4", "ripemd160": "^2.0.1", "sha.js": "^2.4.0" +======= + "cipher-base": "1.0.4", + "inherits": "2.0.3", + "md5.js": "1.3.4", + "ripemd160": "2.0.2", + "sha.js": "2.4.11" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "create-hmac": { @@ -2362,6 +3462,7 @@ "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", "dev": true, "requires": { +<<<<<<< HEAD "cipher-base": "^1.0.3", "create-hash": "^1.1.0", "inherits": "^2.0.1", @@ -2378,6 +3479,24 @@ "requires": { "cross-spawn": "^5.1.0", "is-windows": "^1.0.0" +======= + "cipher-base": "1.0.4", + "create-hash": "1.2.0", + "inherits": "2.0.3", + "ripemd160": "2.0.2", + "safe-buffer": "5.1.2", + "sha.js": "2.4.11" + } + }, + "cross-env": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.1.6.tgz", + "integrity": "sha512-VWTDq+G4v383SzgRS7jsAVWqEWF0aKZpDz1GVjhONvPRgHB1LnxP2sXUVFKbykHkPSnfRKS8YdiDevWFwZmQ9g==", + "dev": true, + "requires": { + "cross-spawn": "5.1.0", + "is-windows": "1.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "cross-spawn": { @@ -2386,9 +3505,15 @@ "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", "dev": true, "requires": { +<<<<<<< HEAD "lru-cache": "^4.0.1", "shebang-command": "^1.2.0", "which": "^1.2.9" +======= + "lru-cache": "4.1.3", + "shebang-command": "1.2.0", + "which": "1.3.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "crypt": { @@ -2403,7 +3528,11 @@ "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", "dev": true, "requires": { +<<<<<<< HEAD "boom": "2.x.x" +======= + "boom": "2.10.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "crypto-browserify": { @@ -2412,6 +3541,7 @@ "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", "dev": true, "requires": { +<<<<<<< HEAD "browserify-cipher": "^1.0.0", "browserify-sign": "^4.0.0", "create-ecdh": "^4.0.0", @@ -2423,6 +3553,19 @@ "public-encrypt": "^4.0.0", "randombytes": "^2.0.0", "randomfill": "^1.0.3" +======= + "browserify-cipher": "1.0.1", + "browserify-sign": "4.0.4", + "create-ecdh": "4.0.3", + "create-hash": "1.2.0", + "create-hmac": "1.1.7", + "diffie-hellman": "5.0.3", + "inherits": "2.0.3", + "pbkdf2": "3.0.16", + "public-encrypt": "4.0.2", + "randombytes": "2.0.6", + "randomfill": "1.0.4" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "css": { @@ -2431,10 +3574,17 @@ "integrity": "sha512-0W171WccAjQGGTKLhw4m2nnl0zPHUlTO/I8td4XzJgIB8Hg3ZZx71qT4G4eX8OVsSiaAKiUMy73E3nsbPlg2DQ==", "dev": true, "requires": { +<<<<<<< HEAD "inherits": "^2.0.1", "source-map": "^0.1.38", "source-map-resolve": "^0.5.1", "urix": "^0.1.0" +======= + "inherits": "2.0.3", + "source-map": "0.1.43", + "source-map-resolve": "0.5.2", + "urix": "0.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "source-map": { @@ -2443,7 +3593,11 @@ "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", "dev": true, "requires": { +<<<<<<< HEAD "amdefine": ">=0.0.4" +======= + "amdefine": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -2460,6 +3614,7 @@ "integrity": "sha512-wovHgjAx8ZIMGSL8pTys7edA1ClmzxHeY6n/d97gg5odgsxEgKjULPR0viqyC+FWMCL9sfqoC/QCUBo62tLvPg==", "dev": true, "requires": { +<<<<<<< HEAD "babel-code-frame": "^6.26.0", "css-selector-tokenizer": "^0.7.0", "cssnano": "^3.10.0", @@ -2527,13 +3682,53 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, +======= + "babel-code-frame": "6.26.0", + "css-selector-tokenizer": "0.7.0", + "cssnano": "3.10.0", + "icss-utils": "2.1.0", + "loader-utils": "1.1.0", + "lodash.camelcase": "4.3.0", + "object-assign": "4.1.1", + "postcss": "5.2.18", + "postcss-modules-extract-imports": "1.2.0", + "postcss-modules-local-by-default": "1.2.0", + "postcss-modules-scope": "1.1.0", + "postcss-modules-values": "1.3.0", + "postcss-value-parser": "3.3.0", + "source-list-map": "2.0.0" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "postcss": { + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.4.5", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { +<<<<<<< HEAD "has-flag": "^1.0.0" +======= + "has-flag": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -2544,10 +3739,17 @@ "integrity": "sha1-b5MZaqrnN2ZuoQNqjLFKj8t6kjE=", "dev": true, "requires": { +<<<<<<< HEAD "boolbase": "^1.0.0", "css-what": "2.1", "domutils": "1.5.1", "nth-check": "^1.0.1" +======= + "boolbase": "1.0.0", + "css-what": "2.1.0", + "domutils": "1.5.1", + "nth-check": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "css-select-base-adapter": { @@ -2562,9 +3764,15 @@ "integrity": "sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=", "dev": true, "requires": { +<<<<<<< HEAD "cssesc": "^0.1.0", "fastparse": "^1.1.1", "regexpu-core": "^1.0.0" +======= + "cssesc": "0.1.0", + "fastparse": "1.1.1", + "regexpu-core": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "regexpu-core": { @@ -2573,9 +3781,15 @@ "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=", "dev": true, "requires": { +<<<<<<< HEAD "regenerate": "^1.2.1", "regjsgen": "^0.2.0", "regjsparser": "^0.1.4" +======= + "regenerate": "1.4.0", + "regjsgen": "0.2.0", + "regjsparser": "0.1.5" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -2586,6 +3800,7 @@ "integrity": "sha512-XC6xLW/JqIGirnZuUWHXCHRaAjje2b3OIB0Vj5RIJo6mIi/AdJo30quQl5LxUl0gkXDIrTrFGbMlcZjyFplz1A==", "dev": true, "requires": { +<<<<<<< HEAD "mdn-data": "^1.0.0", "source-map": "^0.5.3" }, @@ -2596,6 +3811,10 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true } +======= + "mdn-data": "1.1.3", + "source-map": "0.5.7" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "css-url-regex": { @@ -2622,6 +3841,7 @@ "integrity": "sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=", "dev": true, "requires": { +<<<<<<< HEAD "autoprefixer": "^6.3.1", "decamelize": "^1.1.2", "defined": "^1.0.0", @@ -2662,18 +3882,63 @@ "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", "dev": true }, +======= + "autoprefixer": "6.7.7", + "decamelize": "1.2.0", + "defined": "1.0.0", + "has": "1.0.1", + "object-assign": "4.1.1", + "postcss": "5.2.18", + "postcss-calc": "5.3.1", + "postcss-colormin": "2.2.2", + "postcss-convert-values": "2.6.1", + "postcss-discard-comments": "2.0.4", + "postcss-discard-duplicates": "2.1.0", + "postcss-discard-empty": "2.1.0", + "postcss-discard-overridden": "0.1.1", + "postcss-discard-unused": "2.2.3", + "postcss-filter-plugins": "2.0.3", + "postcss-merge-idents": "2.1.7", + "postcss-merge-longhand": "2.0.2", + "postcss-merge-rules": "2.1.2", + "postcss-minify-font-values": "1.0.5", + "postcss-minify-gradients": "1.0.5", + "postcss-minify-params": "1.2.2", + "postcss-minify-selectors": "2.1.1", + "postcss-normalize-charset": "1.1.1", + "postcss-normalize-url": "3.0.8", + "postcss-ordered-values": "2.2.3", + "postcss-reduce-idents": "2.4.0", + "postcss-reduce-initial": "1.0.1", + "postcss-reduce-transforms": "1.0.4", + "postcss-svgo": "2.1.6", + "postcss-unique-selectors": "2.0.2", + "postcss-value-parser": "3.3.0", + "postcss-zindex": "2.2.0" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "autoprefixer": { "version": "6.7.7", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz", "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=", "dev": true, "requires": { +<<<<<<< HEAD "browserslist": "^1.7.6", "caniuse-db": "^1.0.30000634", "normalize-range": "^0.1.2", "num2fraction": "^1.2.2", "postcss": "^5.2.16", "postcss-value-parser": "^3.2.3" +======= + "browserslist": "1.7.7", + "caniuse-db": "1.0.30000849", + "normalize-range": "0.1.2", + "num2fraction": "1.2.2", + "postcss": "5.2.18", + "postcss-value-parser": "3.3.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "browserslist": { @@ -2682,6 +3947,7 @@ "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "dev": true, "requires": { +<<<<<<< HEAD "caniuse-db": "^1.0.30000639", "electron-to-chromium": "^1.2.7" } @@ -2705,6 +3971,10 @@ "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", "dev": true } +======= + "caniuse-db": "1.0.30000849", + "electron-to-chromium": "1.3.48" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "has-flag": { @@ -2719,6 +3989,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.3", "js-base64": "^2.1.9", "source-map": "^0.5.6", @@ -2731,13 +4002,25 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, +======= + "chalk": "1.1.3", + "js-base64": "2.4.5", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { +<<<<<<< HEAD "has-flag": "^1.0.0" +======= + "has-flag": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -2748,6 +4031,7 @@ "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=", "dev": true, "requires": { +<<<<<<< HEAD "clap": "^1.0.9", "source-map": "^0.5.3" }, @@ -2758,6 +4042,10 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true } +======= + "clap": "1.2.3", + "source-map": "0.5.7" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "currently-unhandled": { @@ -2766,7 +4054,11 @@ "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", "dev": true, "requires": { +<<<<<<< HEAD "array-find-index": "^1.0.1" +======= + "array-find-index": "1.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "cyclist": { @@ -2781,7 +4073,11 @@ "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "dev": true, "requires": { +<<<<<<< HEAD "es5-ext": "^0.10.9" +======= + "es5-ext": "0.10.45" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "dashdash": { @@ -2790,7 +4086,11 @@ "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "dev": true, "requires": { +<<<<<<< HEAD "assert-plus": "^1.0.0" +======= + "assert-plus": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "assert-plus": { @@ -2820,9 +4120,15 @@ "dev": true }, "debug": { +<<<<<<< HEAD "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", +======= + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "dev": true, "requires": { "ms": "2.0.0" @@ -2846,6 +4152,7 @@ "integrity": "sha1-rx3VDQbjv8QyRh033hGzjA2ZG+0=", "dev": true, "requires": { +<<<<<<< HEAD "buffer-to-vinyl": "^1.0.0", "concat-stream": "^1.4.6", "decompress-tar": "^3.0.0", @@ -2855,6 +4162,17 @@ "stream-combiner2": "^1.1.1", "vinyl-assign": "^1.0.1", "vinyl-fs": "^2.2.0" +======= + "buffer-to-vinyl": "1.1.0", + "concat-stream": "1.5.2", + "decompress-tar": "3.1.0", + "decompress-tarbz2": "3.1.0", + "decompress-targz": "3.1.0", + "decompress-unzip": "3.4.0", + "stream-combiner2": "1.1.1", + "vinyl-assign": "1.2.1", + "vinyl-fs": "2.4.4" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "decompress-response": { @@ -2863,7 +4181,11 @@ "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", "dev": true, "requires": { +<<<<<<< HEAD "mimic-response": "^1.0.0" +======= + "mimic-response": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "decompress-tar": { @@ -2872,12 +4194,21 @@ "integrity": "sha1-IXx4n5uURQ76rcXF5TeXj8MzxGY=", "dev": true, "requires": { +<<<<<<< HEAD "is-tar": "^1.0.0", "object-assign": "^2.0.0", "strip-dirs": "^1.0.0", "tar-stream": "^1.1.1", "through2": "^0.6.1", "vinyl": "^0.4.3" +======= + "is-tar": "1.0.0", + "object-assign": "2.1.1", + "strip-dirs": "1.1.1", + "tar-stream": "1.6.1", + "through2": "0.6.5", + "vinyl": "0.4.6" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "clone": { @@ -2892,14 +4223,50 @@ "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=", "dev": true }, +<<<<<<< HEAD +======= + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "vinyl": { "version": "0.4.6", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", "dev": true, "requires": { +<<<<<<< HEAD "clone": "^0.2.0", "clone-stats": "^0.0.1" +======= + "clone": "0.2.0", + "clone-stats": "0.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -2910,6 +4277,7 @@ "integrity": "sha1-iyOTVoE1X58YnYclag+L3ZbZZm0=", "dev": true, "requires": { +<<<<<<< HEAD "is-bzip2": "^1.0.0", "object-assign": "^2.0.0", "seek-bzip": "^1.0.3", @@ -2917,6 +4285,15 @@ "tar-stream": "^1.1.1", "through2": "^0.6.1", "vinyl": "^0.4.3" +======= + "is-bzip2": "1.0.0", + "object-assign": "2.1.1", + "seek-bzip": "1.0.5", + "strip-dirs": "1.1.1", + "tar-stream": "1.6.1", + "through2": "0.6.5", + "vinyl": "0.4.6" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "clone": { @@ -2931,14 +4308,50 @@ "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=", "dev": true }, +<<<<<<< HEAD +======= + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "vinyl": { "version": "0.4.6", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", "dev": true, "requires": { +<<<<<<< HEAD "clone": "^0.2.0", "clone-stats": "^0.0.1" +======= + "clone": "0.2.0", + "clone-stats": "0.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -2949,12 +4362,21 @@ "integrity": "sha1-ssE9+YFmJomRtxXWRH9kLpaW9aA=", "dev": true, "requires": { +<<<<<<< HEAD "is-gzip": "^1.0.0", "object-assign": "^2.0.0", "strip-dirs": "^1.0.0", "tar-stream": "^1.1.1", "through2": "^0.6.1", "vinyl": "^0.4.3" +======= + "is-gzip": "1.0.0", + "object-assign": "2.1.1", + "strip-dirs": "1.1.1", + "tar-stream": "1.6.1", + "through2": "0.6.5", + "vinyl": "0.4.6" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "clone": { @@ -2969,14 +4391,50 @@ "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=", "dev": true }, +<<<<<<< HEAD +======= + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "vinyl": { "version": "0.4.6", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", "dev": true, "requires": { +<<<<<<< HEAD "clone": "^0.2.0", "clone-stats": "^0.0.1" +======= + "clone": "0.2.0", + "clone-stats": "0.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -2987,6 +4445,7 @@ "integrity": "sha1-YUdbQVIGa74/7hL51inRX+ZHjus=", "dev": true, "requires": { +<<<<<<< HEAD "is-zip": "^1.0.0", "read-all-stream": "^3.0.0", "stat-mode": "^0.2.0", @@ -3006,6 +4465,15 @@ "xtend": "~4.0.1" } } +======= + "is-zip": "1.0.0", + "read-all-stream": "3.1.0", + "stat-mode": "0.2.2", + "strip-dirs": "1.1.1", + "through2": "2.0.3", + "vinyl": "1.2.0", + "yauzl": "2.9.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "deep-equal": { @@ -3015,9 +4483,15 @@ "dev": true }, "deep-extend": { +<<<<<<< HEAD "version": "0.5.1", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz", "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==", +======= + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "dev": true }, "define-properties": { @@ -3026,8 +4500,13 @@ "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", "dev": true, "requires": { +<<<<<<< HEAD "foreach": "^2.0.5", "object-keys": "^1.0.8" +======= + "foreach": "2.0.5", + "object-keys": "1.0.11" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "define-property": { @@ -3036,8 +4515,13 @@ "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", "dev": true, "requires": { +<<<<<<< HEAD "is-descriptor": "^1.0.2", "isobject": "^3.0.1" +======= + "is-descriptor": "1.0.2", + "isobject": "3.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "is-accessor-descriptor": { @@ -3046,7 +4530,11 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { +<<<<<<< HEAD "kind-of": "^6.0.0" +======= + "kind-of": "6.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "is-data-descriptor": { @@ -3055,7 +4543,11 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { +<<<<<<< HEAD "kind-of": "^6.0.0" +======= + "kind-of": "6.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "is-descriptor": { @@ -3064,10 +4556,29 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { +<<<<<<< HEAD "is-accessor-descriptor": "^1.0.0", "is-data-descriptor": "^1.0.0", "kind-of": "^6.0.2" } +======= + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "dev": true +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } }, @@ -3083,12 +4594,21 @@ "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=", "dev": true, "requires": { +<<<<<<< HEAD "globby": "^6.1.0", "is-path-cwd": "^1.0.0", "is-path-in-cwd": "^1.0.0", "p-map": "^1.1.1", "pify": "^3.0.0", "rimraf": "^2.2.8" +======= + "globby": "6.1.0", + "is-path-cwd": "1.0.0", + "is-path-in-cwd": "1.0.1", + "p-map": "1.2.0", + "pify": "3.0.0", + "rimraf": "2.6.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "delayed-stream": { @@ -3115,8 +4635,13 @@ "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=", "dev": true, "requires": { +<<<<<<< HEAD "inherits": "^2.0.1", "minimalistic-assert": "^1.0.0" +======= + "inherits": "2.0.3", + "minimalistic-assert": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "destroy": { @@ -3125,6 +4650,7 @@ "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=", "dev": true }, +<<<<<<< HEAD "detect-indent": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", @@ -3134,6 +4660,8 @@ "repeating": "^2.0.0" } }, +======= +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "detect-node": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.3.tgz", @@ -3146,9 +4674,15 @@ "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", "dev": true, "requires": { +<<<<<<< HEAD "bn.js": "^4.1.0", "miller-rabin": "^4.0.0", "randombytes": "^2.0.0" +======= + "bn.js": "4.11.8", + "miller-rabin": "4.0.1", + "randombytes": "2.0.6" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "dns-equal": { @@ -3163,8 +4697,13 @@ "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==", "dev": true, "requires": { +<<<<<<< HEAD "ip": "^1.1.0", "safe-buffer": "^5.0.1" +======= + "ip": "1.1.5", + "safe-buffer": "5.1.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "dns-txt": { @@ -3173,7 +4712,11 @@ "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=", "dev": true, "requires": { +<<<<<<< HEAD "buffer-indexof": "^1.0.0" +======= + "buffer-indexof": "1.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "dom-serializer": { @@ -3182,8 +4725,13 @@ "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", "dev": true, "requires": { +<<<<<<< HEAD "domelementtype": "~1.1.1", "entities": "~1.1.1" +======= + "domelementtype": "1.1.3", + "entities": "1.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "domelementtype": { @@ -3195,9 +4743,15 @@ } }, "domain-browser": { +<<<<<<< HEAD "version": "1.2.0", "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==", +======= + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz", + "integrity": "sha1-hnqksJP6oF8d4IwG9NeyH9+GmLw=", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "dev": true }, "domelementtype": { @@ -3212,8 +4766,13 @@ "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", "dev": true, "requires": { +<<<<<<< HEAD "dom-serializer": "0", "domelementtype": "1" +======= + "dom-serializer": "0.1.0", + "domelementtype": "1.3.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "dotenv": { @@ -3234,6 +4793,7 @@ "integrity": "sha1-qlX9rTktldS2jowr4D4MKqIbqaw=", "dev": true, "requires": { +<<<<<<< HEAD "caw": "^1.0.1", "concat-stream": "^1.4.7", "each-async": "^1.0.0", @@ -3249,6 +4809,54 @@ "vinyl": "^1.0.0", "vinyl-fs": "^2.2.0", "ware": "^1.2.0" +======= + "caw": "1.2.0", + "concat-stream": "1.5.2", + "each-async": "1.1.1", + "filenamify": "1.2.1", + "got": "5.7.1", + "gulp-decompress": "1.2.0", + "gulp-rename": "1.2.3", + "is-url": "1.2.4", + "object-assign": "4.1.1", + "read-all-stream": "3.1.0", + "readable-stream": "2.3.6", + "stream-combiner2": "1.1.1", + "vinyl": "1.2.0", + "vinyl-fs": "2.4.4", + "ware": "1.3.0" + }, + "dependencies": { + "got": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/got/-/got-5.7.1.tgz", + "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=", + "dev": true, + "requires": { + "create-error-class": "3.0.2", + "duplexer2": "0.1.4", + "is-redirect": "1.0.0", + "is-retry-allowed": "1.1.0", + "is-stream": "1.1.0", + "lowercase-keys": "1.0.1", + "node-status-codes": "1.0.0", + "object-assign": "4.1.1", + "parse-json": "2.2.0", + "pinkie-promise": "2.0.1", + "read-all-stream": "3.1.0", + "readable-stream": "2.3.6", + "timed-out": "3.1.3", + "unzip-response": "1.0.2", + "url-parse-lax": "1.0.0" + } + }, + "timed-out": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz", + "integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc=", + "dev": true + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "duplexer2": { @@ -3257,7 +4865,11 @@ "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=", "dev": true, "requires": { +<<<<<<< HEAD "readable-stream": "^2.0.2" +======= + "readable-stream": "2.3.6" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "duplexer3": { @@ -3272,10 +4884,17 @@ "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==", "dev": true, "requires": { +<<<<<<< HEAD "end-of-stream": "^1.0.0", "inherits": "^2.0.1", "readable-stream": "^2.0.0", "stream-shift": "^1.0.0" +======= + "end-of-stream": "1.4.1", + "inherits": "2.0.3", + "readable-stream": "2.3.6", + "stream-shift": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "each-async": { @@ -3284,8 +4903,13 @@ "integrity": "sha1-3uUim98KtrogEqOV4bhpq/iBNHM=", "dev": true, "requires": { +<<<<<<< HEAD "onetime": "^1.0.0", "set-immediate-shim": "^1.0.0" +======= + "onetime": "1.1.0", + "set-immediate-shim": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "ecc-jsbn": { @@ -3295,7 +4919,11 @@ "dev": true, "optional": true, "requires": { +<<<<<<< HEAD "jsbn": "~0.1.0" +======= + "jsbn": "0.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "ee-first": { @@ -3305,9 +4933,15 @@ "dev": true }, "electron-to-chromium": { +<<<<<<< HEAD "version": "1.3.47", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.47.tgz", "integrity": "sha1-dk6IfKkQTQGgrI6r7n38DizhQQQ=", +======= + "version": "1.3.48", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.48.tgz", + "integrity": "sha1-07DYWTgUBE4JLs4hCPw6ya6kuQA=", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "dev": true }, "elliptic": { @@ -3316,6 +4950,7 @@ "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=", "dev": true, "requires": { +<<<<<<< HEAD "bn.js": "^4.4.0", "brorand": "^1.0.1", "hash.js": "^1.0.0", @@ -3323,6 +4958,15 @@ "inherits": "^2.0.1", "minimalistic-assert": "^1.0.0", "minimalistic-crypto-utils": "^1.0.0" +======= + "bn.js": "4.11.8", + "brorand": "1.1.0", + "hash.js": "1.1.3", + "hmac-drbg": "1.0.1", + "inherits": "2.0.3", + "minimalistic-assert": "1.0.1", + "minimalistic-crypto-utils": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "emojis-list": { @@ -3343,7 +4987,11 @@ "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", "dev": true, "requires": { +<<<<<<< HEAD "once": "^1.4.0" +======= + "once": "1.4.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "enhanced-resolve": { @@ -3352,10 +5000,17 @@ "integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=", "dev": true, "requires": { +<<<<<<< HEAD "graceful-fs": "^4.1.2", "memory-fs": "^0.4.0", "object-assign": "^4.0.1", "tapable": "^0.2.7" +======= + "graceful-fs": "4.1.11", + "memory-fs": "0.4.1", + "object-assign": "4.1.1", + "tapable": "0.2.8" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "entities": { @@ -3370,7 +5025,11 @@ "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", "dev": true, "requires": { +<<<<<<< HEAD "prr": "~1.0.1" +======= + "prr": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "error-ex": { @@ -3379,6 +5038,7 @@ "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", "dev": true, "requires": { +<<<<<<< HEAD "is-arrayish": "^0.2.1" } }, @@ -3402,6 +5062,31 @@ "has": "^1.0.1", "is-callable": "^1.1.3", "is-regex": "^1.0.4" +======= + "is-arrayish": "0.2.1" + } + }, + "error-stack-parser": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.2.tgz", + "integrity": "sha512-E1fPutRDdIj/hohG0UpT5mayXNCxXP9d+snxFsPU9X0XgccOumKraa3juDMwTUyi7+Bu5+mCGagjg4IYeNbOdw==", + "dev": true, + "requires": { + "stackframe": "1.0.4" + } + }, + "es-abstract": { + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz", + "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==", + "dev": true, + "requires": { + "es-to-primitive": "1.1.1", + "function-bind": "1.1.1", + "has": "1.0.1", + "is-callable": "1.1.3", + "is-regex": "1.0.4" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "es-to-primitive": { @@ -3410,6 +5095,7 @@ "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=", "dev": true, "requires": { +<<<<<<< HEAD "is-callable": "^1.1.1", "is-date-object": "^1.0.1", "is-symbol": "^1.0.1" @@ -3424,6 +5110,22 @@ "es6-iterator": "~2.0.3", "es6-symbol": "~3.1.1", "next-tick": "1" +======= + "is-callable": "1.1.3", + "is-date-object": "1.0.1", + "is-symbol": "1.0.1" + } + }, + "es5-ext": { + "version": "0.10.45", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.45.tgz", + "integrity": "sha512-FkfM6Vxxfmztilbxxz5UKSD4ICMf5tSpRFtDNtkAhOxZ0EKtX6qwmXNyH/sFyIbX2P/nU5AMiA9jilWsUGJzCQ==", + "dev": true, + "requires": { + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1", + "next-tick": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "es6-iterator": { @@ -3432,9 +5134,15 @@ "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", "dev": true, "requires": { +<<<<<<< HEAD "d": "1", "es5-ext": "^0.10.35", "es6-symbol": "^3.1.1" +======= + "d": "1.0.0", + "es5-ext": "0.10.45", + "es6-symbol": "3.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "es6-map": { @@ -3443,12 +5151,21 @@ "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", "dev": true, "requires": { +<<<<<<< HEAD "d": "1", "es5-ext": "~0.10.14", "es6-iterator": "~2.0.1", "es6-set": "~0.1.5", "es6-symbol": "~3.1.1", "event-emitter": "~0.3.5" +======= + "d": "1.0.0", + "es5-ext": "0.10.45", + "es6-iterator": "2.0.3", + "es6-set": "0.1.5", + "es6-symbol": "3.1.1", + "event-emitter": "0.3.5" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "es6-set": { @@ -3457,11 +5174,19 @@ "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", "dev": true, "requires": { +<<<<<<< HEAD "d": "1", "es5-ext": "~0.10.14", "es6-iterator": "~2.0.1", "es6-symbol": "3.1.1", "event-emitter": "~0.3.5" +======= + "d": "1.0.0", + "es5-ext": "0.10.45", + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1", + "event-emitter": "0.3.5" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "es6-symbol": { @@ -3470,8 +5195,13 @@ "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", "dev": true, "requires": { +<<<<<<< HEAD "d": "1", "es5-ext": "~0.10.14" +======= + "d": "1.0.0", + "es5-ext": "0.10.45" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "es6-templates": { @@ -3480,8 +5210,13 @@ "integrity": "sha1-XLmsn7He1usSOTQrgdeSu7QHjuQ=", "dev": true, "requires": { +<<<<<<< HEAD "recast": "~0.11.12", "through": "~2.3.6" +======= + "recast": "0.11.23", + "through": "2.3.8" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "es6-weak-map": { @@ -3490,10 +5225,17 @@ "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", "dev": true, "requires": { +<<<<<<< HEAD "d": "1", "es5-ext": "^0.10.14", "es6-iterator": "^2.0.1", "es6-symbol": "^3.1.1" +======= + "d": "1.0.0", + "es5-ext": "0.10.45", + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "escape-html": { @@ -3514,10 +5256,17 @@ "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=", "dev": true, "requires": { +<<<<<<< HEAD "es6-map": "^0.1.3", "es6-weak-map": "^2.0.1", "esrecurse": "^4.1.0", "estraverse": "^4.1.1" +======= + "es6-map": "0.1.5", + "es6-weak-map": "2.0.2", + "esrecurse": "4.2.1", + "estraverse": "4.2.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "esprima": { @@ -3532,7 +5281,11 @@ "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", "dev": true, "requires": { +<<<<<<< HEAD "estraverse": "^4.1.0" +======= + "estraverse": "4.2.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "estraverse": { @@ -3559,8 +5312,13 @@ "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", "dev": true, "requires": { +<<<<<<< HEAD "d": "1", "es5-ext": "~0.10.14" +======= + "d": "1.0.0", + "es5-ext": "0.10.45" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "eventemitter3": { @@ -3581,7 +5339,11 @@ "integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=", "dev": true, "requires": { +<<<<<<< HEAD "original": ">=0.0.5" +======= + "original": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "evp_bytestokey": { @@ -3590,8 +5352,13 @@ "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", "dev": true, "requires": { +<<<<<<< HEAD "md5.js": "^1.3.4", "safe-buffer": "^5.1.1" +======= + "md5.js": "1.3.4", + "safe-buffer": "5.1.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "exec-buffer": { @@ -3600,11 +5367,19 @@ "integrity": "sha512-wsiD+2Tp6BWHoVv3B+5Dcx6E7u5zky+hUwOHjuH2hKSLR3dvRmX8fk8UD8uqQixHs4Wk6eDmiegVrMPjKj7wpA==", "dev": true, "requires": { +<<<<<<< HEAD "execa": "^0.7.0", "p-finally": "^1.0.0", "pify": "^3.0.0", "rimraf": "^2.5.4", "tempfile": "^2.0.0" +======= + "execa": "0.7.0", + "p-finally": "1.0.0", + "pify": "3.0.0", + "rimraf": "2.6.2", + "tempfile": "2.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "exec-series": { @@ -3613,8 +5388,13 @@ "integrity": "sha1-bSV6m+rEgqhyx3g7yGFYOfx3FDo=", "dev": true, "requires": { +<<<<<<< HEAD "async-each-series": "^1.1.0", "object-assign": "^4.1.0" +======= + "async-each-series": "1.1.0", + "object-assign": "4.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "execa": { @@ -3623,6 +5403,7 @@ "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", "dev": true, "requires": { +<<<<<<< HEAD "cross-spawn": "^5.0.1", "get-stream": "^3.0.0", "is-stream": "^1.1.0", @@ -3630,6 +5411,15 @@ "p-finally": "^1.0.0", "signal-exit": "^3.0.0", "strip-eof": "^1.0.0" +======= + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "executable": { @@ -3638,6 +5428,7 @@ "integrity": "sha1-h3mA6REvM5EGbaNyZd562ENKtNk=", "dev": true, "requires": { +<<<<<<< HEAD "meow": "^3.1.0" } }, @@ -3683,6 +5474,18 @@ "is-extendable": "^0.1.0" } } +======= + "meow": "3.7.0" + } + }, + "expand-brackets": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", + "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", + "dev": true, + "requires": { + "is-posix-bracket": "0.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "expand-range": { @@ -3691,6 +5494,7 @@ "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", "dev": true, "requires": { +<<<<<<< HEAD "fill-range": "^2.1.0" }, "dependencies": { @@ -3734,6 +5538,9 @@ "is-buffer": "^1.1.5" } } +======= + "fill-range": "2.2.4" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "express": { @@ -3742,6 +5549,7 @@ "integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=", "dev": true, "requires": { +<<<<<<< HEAD "accepts": "~1.3.5", "array-flatten": "1.1.1", "body-parser": "1.18.2", @@ -3764,10 +5572,35 @@ "proxy-addr": "~2.0.3", "qs": "6.5.1", "range-parser": "~1.2.0", +======= + "accepts": "1.3.5", + "array-flatten": "1.1.1", + "body-parser": "1.18.2", + "content-disposition": "0.5.2", + "content-type": "1.0.4", + "cookie": "0.3.1", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "1.1.2", + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "etag": "1.8.1", + "finalhandler": "1.1.1", + "fresh": "0.5.2", + "merge-descriptors": "1.0.1", + "methods": "1.1.2", + "on-finished": "2.3.0", + "parseurl": "1.3.2", + "path-to-regexp": "0.1.7", + "proxy-addr": "2.0.3", + "qs": "6.5.1", + "range-parser": "1.2.0", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "safe-buffer": "5.1.1", "send": "0.16.2", "serve-static": "1.13.2", "setprototypeof": "1.1.0", +<<<<<<< HEAD "statuses": "~1.4.0", "type-is": "~1.6.16", "utils-merge": "1.0.1", @@ -3795,6 +5628,14 @@ "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==", "dev": true }, +======= + "statuses": "1.4.0", + "type-is": "1.6.16", + "utils-merge": "1.0.1", + "vary": "1.1.2" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "safe-buffer": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", @@ -3809,7 +5650,11 @@ "integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==", "dev": true, "requires": { +<<<<<<< HEAD "mime-db": "^1.28.0" +======= + "mime-db": "1.33.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "ext-name": { @@ -3818,8 +5663,13 @@ "integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==", "dev": true, "requires": { +<<<<<<< HEAD "ext-list": "^2.0.0", "sort-keys-length": "^1.0.0" +======= + "ext-list": "2.2.2", + "sort-keys-length": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "extend": { @@ -3834,8 +5684,13 @@ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { +<<<<<<< HEAD "assign-symbols": "^1.0.0", "is-extendable": "^1.0.1" +======= + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "is-extendable": { @@ -3844,12 +5699,17 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { +<<<<<<< HEAD "is-plain-object": "^2.0.4" +======= + "is-plain-object": "2.0.4" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } }, "extglob": { +<<<<<<< HEAD "version": "2.0.4", "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", @@ -3910,10 +5770,40 @@ "is-accessor-descriptor": "^1.0.0", "is-data-descriptor": "^1.0.0", "kind-of": "^6.0.2" +======= + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", + "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + }, + "extract-text-webpack-plugin": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz", + "integrity": "sha512-bt/LZ4m5Rqt/Crl2HiKuAl/oqg0psx1tsTLkvWbJen1CtD+fftkZhMaQ9HOtY2gWsl2Wq+sABmMVi9z3DhKWQQ==", + "dev": true, + "requires": { + "async": "2.6.1", + "loader-utils": "1.1.0", + "schema-utils": "0.3.0", + "webpack-sources": "1.1.0" + }, + "dependencies": { + "async": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", + "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", + "dev": true, + "requires": { + "lodash": "4.17.10" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } }, +<<<<<<< HEAD "extract-text-webpack-plugin": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz", @@ -3926,6 +5816,8 @@ "webpack-sources": "^1.0.1" } }, +======= +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "extsprintf": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", @@ -3938,9 +5830,15 @@ "integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=", "dev": true, "requires": { +<<<<<<< HEAD "ansi-gray": "^0.1.1", "color-support": "^1.1.3", "time-stamp": "^1.0.0" +======= + "ansi-gray": "0.1.1", + "color-support": "1.1.3", + "time-stamp": "1.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "fast-deep-equal": { @@ -3967,6 +5865,7 @@ "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", "dev": true, "requires": { +<<<<<<< HEAD "websocket-driver": ">=0.5.1" } }, @@ -3977,6 +5876,18 @@ "dev": true, "requires": { "pend": "~1.2.0" +======= + "websocket-driver": "0.7.0" + } + }, + "fd-slicer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", + "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", + "dev": true, + "requires": { + "pend": "1.2.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "figures": { @@ -3985,8 +5896,13 @@ "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", "dev": true, "requires": { +<<<<<<< HEAD "escape-string-regexp": "^1.0.5", "object-assign": "^4.1.0" +======= + "escape-string-regexp": "1.0.5", + "object-assign": "4.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "file-loader": { @@ -3995,7 +5911,11 @@ "integrity": "sha512-N+uhF3mswIFeziHQjGScJ/yHXYt3DiLBeC+9vWW+WjUBiClMSOlV1YrXQi+7KM2aA3Rn4Bybgv+uXFQbfkzpvg==", "dev": true, "requires": { +<<<<<<< HEAD "loader-utils": "^1.0.2" +======= + "loader-utils": "1.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "file-type": { @@ -4022,6 +5942,7 @@ "integrity": "sha1-qfL/0RxQO+0wABUCknI3jx8TZaU=", "dev": true, "requires": { +<<<<<<< HEAD "filename-reserved-regex": "^1.0.0", "strip-outer": "^1.0.0", "trim-repeated": "^1.0.0" @@ -4048,6 +5969,24 @@ "is-extendable": "^0.1.0" } } +======= + "filename-reserved-regex": "1.0.0", + "strip-outer": "1.0.1", + "trim-repeated": "1.0.0" + } + }, + "fill-range": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz", + "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==", + "dev": true, + "requires": { + "is-number": "2.1.0", + "isobject": "2.1.0", + "randomatic": "3.0.0", + "repeat-element": "1.1.2", + "repeat-string": "1.6.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "finalhandler": { @@ -4057,6 +5996,7 @@ "dev": true, "requires": { "debug": "2.6.9", +<<<<<<< HEAD "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "on-finished": "~2.3.0", @@ -4074,6 +6014,14 @@ "ms": "2.0.0" } } +======= + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "on-finished": "2.3.0", + "parseurl": "1.3.2", + "statuses": "1.4.0", + "unpipe": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "find-cache-dir": { @@ -4082,9 +6030,15 @@ "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", "dev": true, "requires": { +<<<<<<< HEAD "commondir": "^1.0.1", "make-dir": "^1.0.0", "pkg-dir": "^2.0.0" +======= + "commondir": "1.0.1", + "make-dir": "1.3.0", + "pkg-dir": "2.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "find-up": { @@ -4093,7 +6047,11 @@ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "requires": { +<<<<<<< HEAD "locate-path": "^2.0.0" +======= + "locate-path": "2.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "find-versions": { @@ -4102,10 +6060,17 @@ "integrity": "sha1-y96fEuOFdaCvG+G5osXV/Y8Ya2I=", "dev": true, "requires": { +<<<<<<< HEAD "array-uniq": "^1.0.0", "get-stdin": "^4.0.1", "meow": "^3.5.0", "semver-regex": "^1.0.0" +======= + "array-uniq": "1.0.3", + "get-stdin": "4.0.1", + "meow": "3.7.0", + "semver-regex": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "first-chunk-stream": { @@ -4126,8 +6091,13 @@ "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==", "dev": true, "requires": { +<<<<<<< HEAD "inherits": "^2.0.1", "readable-stream": "^2.0.4" +======= + "inherits": "2.0.3", + "readable-stream": "2.3.6" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "follow-redirects": { @@ -4136,7 +6106,22 @@ "integrity": "sha512-fdrt472/9qQ6Kgjvb935ig6vJCuofpBUD14f9Vb+SLlm7xIe4Qva5gey8EKtv8lp7ahE1wilg3xL1znpVGtZIA==", "dev": true, "requires": { +<<<<<<< HEAD "debug": "^3.1.0" +======= + "debug": "3.1.0" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "for-in": { @@ -4151,7 +6136,11 @@ "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", "dev": true, "requires": { +<<<<<<< HEAD "for-in": "^1.0.1" +======= + "for-in": "1.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "foreach": { @@ -4172,9 +6161,15 @@ "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", "dev": true, "requires": { +<<<<<<< HEAD "asynckit": "^0.4.0", "combined-stream": "^1.0.5", "mime-types": "^2.1.12" +======= + "asynckit": "0.4.0", + "combined-stream": "1.0.6", + "mime-types": "2.1.18" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "forwarded": { @@ -4189,7 +6184,11 @@ "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", "dev": true, "requires": { +<<<<<<< HEAD "map-cache": "^0.2.2" +======= + "map-cache": "0.2.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "fresh": { @@ -4204,6 +6203,7 @@ "integrity": "sha512-K27M3VK30wVoOarP651zDmb93R9zF28usW4ocaK3mfQeIEI5BPht/EzZs5E8QLLwbLRJQMwscAjDxYPb1FuNiw==", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.3", "error-stack-parser": "^2.0.0", "string-width": "^2.0.0" @@ -4234,6 +6234,11 @@ "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", "dev": true } +======= + "chalk": "1.1.3", + "error-stack-parser": "2.0.2", + "string-width": "2.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "from2": { @@ -4242,8 +6247,13 @@ "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", "dev": true, "requires": { +<<<<<<< HEAD "inherits": "^2.0.1", "readable-stream": "^2.0.0" +======= + "inherits": "2.0.3", + "readable-stream": "2.3.6" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "fs-constants": { @@ -4258,9 +6268,15 @@ "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=", "dev": true, "requires": { +<<<<<<< HEAD "graceful-fs": "^4.1.2", "jsonfile": "^3.0.0", "universalify": "^0.1.0" +======= + "graceful-fs": "4.1.11", + "jsonfile": "3.0.1", + "universalify": "0.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "fs-write-stream-atomic": { @@ -4269,10 +6285,17 @@ "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", "dev": true, "requires": { +<<<<<<< HEAD "graceful-fs": "^4.1.2", "iferr": "^0.1.5", "imurmurhash": "^0.1.4", "readable-stream": "1 || 2" +======= + "graceful-fs": "4.1.11", + "iferr": "0.1.5", + "imurmurhash": "0.1.4", + "readable-stream": "2.3.6" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "fs.realpath": { @@ -4288,8 +6311,13 @@ "dev": true, "optional": true, "requires": { +<<<<<<< HEAD "nan": "^2.9.2", "node-pre-gyp": "^0.10.0" +======= + "nan": "2.10.0", + "node-pre-gyp": "0.10.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "abbrev": { @@ -4315,8 +6343,13 @@ "dev": true, "optional": true, "requires": { +<<<<<<< HEAD "delegates": "^1.0.0", "readable-stream": "^2.0.6" +======= + "delegates": "1.0.0", + "readable-stream": "2.3.6" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "balanced-match": { @@ -4329,7 +6362,11 @@ "bundled": true, "dev": true, "requires": { +<<<<<<< HEAD "balanced-match": "^1.0.0", +======= + "balanced-match": "1.0.0", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "concat-map": "0.0.1" } }, @@ -4393,7 +6430,11 @@ "dev": true, "optional": true, "requires": { +<<<<<<< HEAD "minipass": "^2.2.1" +======= + "minipass": "2.2.4" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "fs.realpath": { @@ -4408,6 +6449,7 @@ "dev": true, "optional": true, "requires": { +<<<<<<< HEAD "aproba": "^1.0.3", "console-control-strings": "^1.0.0", "has-unicode": "^2.0.0", @@ -4416,6 +6458,16 @@ "string-width": "^1.0.1", "strip-ansi": "^3.0.1", "wide-align": "^1.1.0" +======= + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "glob": { @@ -4424,12 +6476,21 @@ "dev": true, "optional": true, "requires": { +<<<<<<< HEAD "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.0.4", "once": "^1.3.0", "path-is-absolute": "^1.0.0" +======= + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "has-unicode": { @@ -4444,7 +6505,11 @@ "dev": true, "optional": true, "requires": { +<<<<<<< HEAD "safer-buffer": "^2.1.0" +======= + "safer-buffer": "2.1.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "ignore-walk": { @@ -4453,7 +6518,11 @@ "dev": true, "optional": true, "requires": { +<<<<<<< HEAD "minimatch": "^3.0.4" +======= + "minimatch": "3.0.4" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "inflight": { @@ -4462,8 +6531,13 @@ "dev": true, "optional": true, "requires": { +<<<<<<< HEAD "once": "^1.3.0", "wrappy": "1" +======= + "once": "1.4.0", + "wrappy": "1.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "inherits": { @@ -4482,7 +6556,11 @@ "bundled": true, "dev": true, "requires": { +<<<<<<< HEAD "number-is-nan": "^1.0.0" +======= + "number-is-nan": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "isarray": { @@ -4496,7 +6574,11 @@ "bundled": true, "dev": true, "requires": { +<<<<<<< HEAD "brace-expansion": "^1.1.7" +======= + "brace-expansion": "1.1.11" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "minimist": { @@ -4509,8 +6591,13 @@ "bundled": true, "dev": true, "requires": { +<<<<<<< HEAD "safe-buffer": "^5.1.1", "yallist": "^3.0.0" +======= + "safe-buffer": "5.1.1", + "yallist": "3.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "minizlib": { @@ -4519,7 +6606,11 @@ "dev": true, "optional": true, "requires": { +<<<<<<< HEAD "minipass": "^2.2.1" +======= + "minipass": "2.2.4" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "mkdirp": { @@ -4542,9 +6633,15 @@ "dev": true, "optional": true, "requires": { +<<<<<<< HEAD "debug": "^2.1.2", "iconv-lite": "^0.4.4", "sax": "^1.2.4" +======= + "debug": "2.6.9", + "iconv-lite": "0.4.21", + "sax": "1.2.4" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "node-pre-gyp": { @@ -4553,6 +6650,7 @@ "dev": true, "optional": true, "requires": { +<<<<<<< HEAD "detect-libc": "^1.0.2", "mkdirp": "^0.5.1", "needle": "^2.2.0", @@ -4563,6 +6661,18 @@ "rimraf": "^2.6.1", "semver": "^5.3.0", "tar": "^4" +======= + "detect-libc": "1.0.3", + "mkdirp": "0.5.1", + "needle": "2.2.0", + "nopt": "4.0.1", + "npm-packlist": "1.1.10", + "npmlog": "4.1.2", + "rc": "1.2.7", + "rimraf": "2.6.2", + "semver": "5.5.0", + "tar": "4.4.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "nopt": { @@ -4571,8 +6681,13 @@ "dev": true, "optional": true, "requires": { +<<<<<<< HEAD "abbrev": "1", "osenv": "^0.1.4" +======= + "abbrev": "1.1.1", + "osenv": "0.1.5" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "npm-bundled": { @@ -4587,8 +6702,13 @@ "dev": true, "optional": true, "requires": { +<<<<<<< HEAD "ignore-walk": "^3.0.1", "npm-bundled": "^1.0.1" +======= + "ignore-walk": "3.0.1", + "npm-bundled": "1.0.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "npmlog": { @@ -4597,10 +6717,17 @@ "dev": true, "optional": true, "requires": { +<<<<<<< HEAD "are-we-there-yet": "~1.1.2", "console-control-strings": "~1.1.0", "gauge": "~2.7.3", "set-blocking": "~2.0.0" +======= + "are-we-there-yet": "1.1.4", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "number-is-nan": { @@ -4619,7 +6746,11 @@ "bundled": true, "dev": true, "requires": { +<<<<<<< HEAD "wrappy": "1" +======= + "wrappy": "1.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "os-homedir": { @@ -4640,8 +6771,13 @@ "dev": true, "optional": true, "requires": { +<<<<<<< HEAD "os-homedir": "^1.0.0", "os-tmpdir": "^1.0.0" +======= + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "path-is-absolute": { @@ -4662,10 +6798,17 @@ "dev": true, "optional": true, "requires": { +<<<<<<< HEAD "deep-extend": "^0.5.1", "ini": "~1.3.0", "minimist": "^1.2.0", "strip-json-comments": "~2.0.1" +======= + "deep-extend": "0.5.1", + "ini": "1.3.5", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "minimist": { @@ -4682,6 +6825,7 @@ "dev": true, "optional": true, "requires": { +<<<<<<< HEAD "core-util-is": "~1.0.0", "inherits": "~2.0.3", "isarray": "~1.0.0", @@ -4689,6 +6833,15 @@ "safe-buffer": "~5.1.1", "string_decoder": "~1.1.1", "util-deprecate": "~1.0.1" +======= + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.1", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "rimraf": { @@ -4697,7 +6850,11 @@ "dev": true, "optional": true, "requires": { +<<<<<<< HEAD "glob": "^7.0.5" +======= + "glob": "7.1.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "safe-buffer": { @@ -4740,9 +6897,15 @@ "bundled": true, "dev": true, "requires": { +<<<<<<< HEAD "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", "strip-ansi": "^3.0.0" +======= + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "string_decoder": { @@ -4751,7 +6914,11 @@ "dev": true, "optional": true, "requires": { +<<<<<<< HEAD "safe-buffer": "~5.1.0" +======= + "safe-buffer": "5.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "strip-ansi": { @@ -4759,7 +6926,11 @@ "bundled": true, "dev": true, "requires": { +<<<<<<< HEAD "ansi-regex": "^2.0.0" +======= + "ansi-regex": "2.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "strip-json-comments": { @@ -4774,6 +6945,7 @@ "dev": true, "optional": true, "requires": { +<<<<<<< HEAD "chownr": "^1.0.1", "fs-minipass": "^1.2.5", "minipass": "^2.2.4", @@ -4781,6 +6953,15 @@ "mkdirp": "^0.5.0", "safe-buffer": "^5.1.1", "yallist": "^3.0.2" +======= + "chownr": "1.0.1", + "fs-minipass": "1.2.5", + "minipass": "2.2.4", + "minizlib": "1.1.0", + "mkdirp": "0.5.1", + "safe-buffer": "5.1.1", + "yallist": "3.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "util-deprecate": { @@ -4795,7 +6976,11 @@ "dev": true, "optional": true, "requires": { +<<<<<<< HEAD "string-width": "^1.0.2" +======= + "string-width": "1.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "wrappy": { @@ -4816,10 +7001,17 @@ "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", "dev": true, "requires": { +<<<<<<< HEAD "graceful-fs": "^4.1.2", "inherits": "~2.0.0", "mkdirp": ">=0.5 0", "rimraf": "2" +======= + "graceful-fs": "4.1.11", + "inherits": "2.0.3", + "mkdirp": "0.5.1", + "rimraf": "2.6.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "function-bind": { @@ -4834,6 +7026,7 @@ "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, "requires": { +<<<<<<< HEAD "aproba": "^1.0.3", "console-control-strings": "^1.0.0", "has-unicode": "^2.0.0", @@ -4853,15 +7046,33 @@ "number-is-nan": "^1.0.0" } }, +======= + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.3" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { +<<<<<<< HEAD "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", "strip-ansi": "^3.0.0" +======= + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -4872,7 +7083,11 @@ "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", "dev": true, "requires": { +<<<<<<< HEAD "globule": "^1.0.0" +======= + "globule": "1.2.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "generate-function": { @@ -4887,7 +7102,11 @@ "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=", "dev": true, "requires": { +<<<<<<< HEAD "is-property": "^1.0.0" +======= + "is-property": "1.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "get-caller-file": { @@ -4902,7 +7121,11 @@ "integrity": "sha1-iUhUSRvFkbDxR9euVw9cZ4tyVus=", "dev": true, "requires": { +<<<<<<< HEAD "rc": "^1.1.2" +======= + "rc": "1.2.8" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "get-stdin": { @@ -4929,7 +7152,11 @@ "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "dev": true, "requires": { +<<<<<<< HEAD "assert-plus": "^1.0.0" +======= + "assert-plus": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "assert-plus": { @@ -4946,6 +7173,7 @@ "integrity": "sha1-9Fy17RAWW2ZdySng6TKLbIId+js=", "dev": true, "requires": { +<<<<<<< HEAD "bin-build": "^2.0.0", "bin-wrapper": "^3.0.0", "logalot": "^2.0.0" @@ -4963,6 +7191,24 @@ "minimatch": "^3.0.4", "once": "^1.3.0", "path-is-absolute": "^1.0.0" +======= + "bin-build": "2.2.0", + "bin-wrapper": "3.0.2", + "logalot": "2.1.0" + } + }, + "glob": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", + "dev": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "glob-base": { @@ -4971,6 +7217,7 @@ "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", "dev": true, "requires": { +<<<<<<< HEAD "glob-parent": "^2.0.0", "is-glob": "^2.0.0" }, @@ -5020,6 +7267,19 @@ "is-extglob": "^2.1.0" } } +======= + "glob-parent": "2.0.0", + "is-glob": "2.0.1" + } + }, + "glob-parent": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", + "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", + "dev": true, + "requires": { + "is-glob": "2.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "glob-stream": { @@ -5028,6 +7288,7 @@ "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=", "dev": true, "requires": { +<<<<<<< HEAD "extend": "^3.0.0", "glob": "^5.0.3", "glob-parent": "^3.0.0", @@ -5138,6 +7399,69 @@ "object.omit": "^2.0.0", "parse-glob": "^3.0.4", "regex-cache": "^0.4.2" +======= + "extend": "3.0.1", + "glob": "5.0.15", + "glob-parent": "3.1.0", + "micromatch": "2.3.11", + "ordered-read-streams": "0.3.0", + "through2": "0.6.5", + "to-absolute-glob": "0.1.1", + "unique-stream": "2.2.1" + }, + "dependencies": { + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "dev": true, + "requires": { + "is-glob": "3.1.0", + "path-dirname": "1.0.2" + } + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true + }, + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "dev": true, + "requires": { + "is-extglob": "2.1.1" + } + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -5154,6 +7478,7 @@ "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, "requires": { +<<<<<<< HEAD "array-union": "^1.0.1", "glob": "^7.0.3", "object-assign": "^4.0.1", @@ -5161,6 +7486,29 @@ "pinkie-promise": "^2.0.0" }, "dependencies": { +======= + "array-union": "1.0.2", + "glob": "7.1.2", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + }, + "dependencies": { + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", @@ -5175,6 +7523,7 @@ "integrity": "sha512-D23dWbOq48vlOraoSigbcQV4tWrnhwk+E/Um2cMuDS3/5dwGmdFeA7L/vAvDhLFlQOTDqHcXh35m/71g2A2WzQ==", "dev": true, "requires": { +<<<<<<< HEAD "glob": "^7.1.1" } }, @@ -5187,6 +7536,52 @@ "glob": "~7.1.1", "lodash": "~4.17.4", "minimatch": "~3.0.2" +======= + "glob": "7.1.2" + }, + "dependencies": { + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + } + } + }, + "globule": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz", + "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==", + "dev": true, + "requires": { + "glob": "7.1.2", + "lodash": "4.17.10", + "minimatch": "3.0.4" + }, + "dependencies": { + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "glogg": { @@ -5195,6 +7590,7 @@ "integrity": "sha512-ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==", "dev": true, "requires": { +<<<<<<< HEAD "sparkles": "^1.0.0" } }, @@ -5219,6 +7615,9 @@ "timed-out": "^3.0.0", "unzip-response": "^1.0.2", "url-parse-lax": "^1.0.0" +======= + "sparkles": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "graceful-fs": { @@ -5245,10 +7644,17 @@ "integrity": "sha1-jutlpeAV+O2FMsr+KEVJYGJvDcc=", "dev": true, "requires": { +<<<<<<< HEAD "archive-type": "^3.0.0", "decompress": "^3.0.0", "gulp-util": "^3.0.1", "readable-stream": "^2.0.2" +======= + "archive-type": "3.2.0", + "decompress": "3.0.0", + "gulp-util": "3.0.8", + "readable-stream": "2.3.6" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "gulp-rename": { @@ -5263,6 +7669,7 @@ "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=", "dev": true, "requires": { +<<<<<<< HEAD "convert-source-map": "^1.1.1", "graceful-fs": "^4.1.2", "strip-bom": "^2.0.0", @@ -5280,6 +7687,13 @@ "xtend": "~4.0.1" } } +======= + "convert-source-map": "1.1.3", + "graceful-fs": "4.1.11", + "strip-bom": "2.0.0", + "through2": "2.0.3", + "vinyl": "1.2.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "gulp-util": { @@ -5288,6 +7702,7 @@ "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=", "dev": true, "requires": { +<<<<<<< HEAD "array-differ": "^1.0.0", "array-uniq": "^1.0.2", "beeper": "^1.0.0", @@ -5327,6 +7742,28 @@ "supports-color": "^2.0.0" } }, +======= + "array-differ": "1.0.0", + "array-uniq": "1.0.3", + "beeper": "1.1.1", + "chalk": "1.1.3", + "dateformat": "2.2.0", + "fancy-log": "1.3.2", + "gulplog": "1.0.0", + "has-gulplog": "0.1.0", + "lodash._reescape": "3.0.0", + "lodash._reevaluate": "3.0.0", + "lodash._reinterpolate": "3.0.0", + "lodash.template": "3.6.2", + "minimist": "1.2.0", + "multipipe": "0.1.2", + "object-assign": "3.0.0", + "replace-ext": "0.0.1", + "through2": "2.0.3", + "vinyl": "0.5.3" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "minimist": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", @@ -5345,6 +7782,7 @@ "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=", "dev": true }, +<<<<<<< HEAD "supports-color": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", @@ -5361,14 +7799,21 @@ "xtend": "~4.0.1" } }, +======= +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "vinyl": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=", "dev": true, "requires": { +<<<<<<< HEAD "clone": "^1.0.0", "clone-stats": "^0.0.1", +======= + "clone": "1.0.4", + "clone-stats": "0.0.1", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "replace-ext": "0.0.1" } } @@ -5380,7 +7825,11 @@ "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", "dev": true, "requires": { +<<<<<<< HEAD "glogg": "^1.0.0" +======= + "glogg": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "handle-thing": { @@ -5395,6 +7844,7 @@ "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.1", "commander": "^2.9.0", "is-my-json-valid": "^2.12.4", @@ -5426,6 +7876,12 @@ "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", "dev": true } +======= + "chalk": "1.1.3", + "commander": "2.15.1", + "is-my-json-valid": "2.17.2", + "pinkie-promise": "2.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "has": { @@ -5434,7 +7890,11 @@ "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=", "dev": true, "requires": { +<<<<<<< HEAD "function-bind": "^1.0.2" +======= + "function-bind": "1.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "has-ansi": { @@ -5443,7 +7903,11 @@ "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "dev": true, "requires": { +<<<<<<< HEAD "ansi-regex": "^2.0.0" +======= + "ansi-regex": "2.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "has-flag": { @@ -5458,7 +7922,11 @@ "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=", "dev": true, "requires": { +<<<<<<< HEAD "sparkles": "^1.0.0" +======= + "sparkles": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "has-symbol-support-x": { @@ -5473,7 +7941,11 @@ "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==", "dev": true, "requires": { +<<<<<<< HEAD "has-symbol-support-x": "^1.4.1" +======= + "has-symbol-support-x": "1.4.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "has-unicode": { @@ -5488,9 +7960,23 @@ "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", "dev": true, "requires": { +<<<<<<< HEAD "get-value": "^2.0.6", "has-values": "^1.0.0", "isobject": "^3.0.0" +======= + "get-value": "2.0.6", + "has-values": "1.0.0", + "isobject": "3.0.1" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "has-values": { @@ -5499,17 +7985,48 @@ "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", "dev": true, "requires": { +<<<<<<< HEAD "is-number": "^3.0.0", "kind-of": "^4.0.0" }, "dependencies": { +======= + "is-number": "3.0.0", + "kind-of": "4.0.0" + }, + "dependencies": { + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "kind-of": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "dev": true, "requires": { +<<<<<<< HEAD "is-buffer": "^1.1.5" +======= + "is-buffer": "1.1.6" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -5520,8 +8037,13 @@ "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=", "dev": true, "requires": { +<<<<<<< HEAD "inherits": "^2.0.1", "safe-buffer": "^5.0.1" +======= + "inherits": "2.0.3", + "safe-buffer": "5.1.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "hash-sum": { @@ -5536,8 +8058,13 @@ "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", "dev": true, "requires": { +<<<<<<< HEAD "inherits": "^2.0.3", "minimalistic-assert": "^1.0.0" +======= + "inherits": "2.0.3", + "minimalistic-assert": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "hawk": { @@ -5546,10 +8073,17 @@ "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", "dev": true, "requires": { +<<<<<<< HEAD "boom": "2.x.x", "cryptiles": "2.x.x", "hoek": "2.x.x", "sntp": "1.x.x" +======= + "boom": "2.10.1", + "cryptiles": "2.0.5", + "hoek": "2.16.3", + "sntp": "1.0.9" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "he": { @@ -5564,9 +8098,15 @@ "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", "dev": true, "requires": { +<<<<<<< HEAD "hash.js": "^1.0.3", "minimalistic-assert": "^1.0.0", "minimalistic-crypto-utils": "^1.0.1" +======= + "hash.js": "1.1.3", + "minimalistic-assert": "1.0.1", + "minimalistic-crypto-utils": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "hoek": { @@ -5581,8 +8121,13 @@ "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", "dev": true, "requires": { +<<<<<<< HEAD "os-homedir": "^1.0.0", "os-tmpdir": "^1.0.1" +======= + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "hosted-git-info": { @@ -5597,10 +8142,17 @@ "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=", "dev": true, "requires": { +<<<<<<< HEAD "inherits": "^2.0.1", "obuf": "^1.0.0", "readable-stream": "^2.0.1", "wbuf": "^1.1.0" +======= + "inherits": "2.0.3", + "obuf": "1.1.2", + "readable-stream": "2.3.6", + "wbuf": "1.7.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "html-comment-regex": { @@ -5621,11 +8173,19 @@ "integrity": "sha1-X7zYfNY6XEmn/OL+VvQl4Fcpxow=", "dev": true, "requires": { +<<<<<<< HEAD "es6-templates": "^0.2.2", "fastparse": "^1.1.1", "html-minifier": "^3.0.1", "loader-utils": "^1.0.2", "object-assign": "^4.1.0" +======= + "es6-templates": "0.2.3", + "fastparse": "1.1.1", + "html-minifier": "3.5.16", + "loader-utils": "1.1.0", + "object-assign": "4.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "html-minifier": { @@ -5634,6 +8194,7 @@ "integrity": "sha512-zP5EfLSpiLRp0aAgud4CQXPQZm9kXwWjR/cF0PfdOj+jjWnOaCgeZcll4kYXSvIBPeUMmyaSc7mM4IDtA+kboA==", "dev": true, "requires": { +<<<<<<< HEAD "camel-case": "3.0.x", "clean-css": "4.1.x", "commander": "2.15.x", @@ -5651,6 +8212,31 @@ "requires": { "commander": "~2.15.0", "source-map": "~0.6.1" +======= + "camel-case": "3.0.0", + "clean-css": "4.1.11", + "commander": "2.15.1", + "he": "1.1.1", + "param-case": "2.1.1", + "relateurl": "0.2.7", + "uglify-js": "3.3.28" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "uglify-js": { + "version": "3.3.28", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.28.tgz", + "integrity": "sha512-68Rc/aA6cswiaQ5SrE979UJcXX+ADA1z33/ZsPd+fbAiVdjZ16OXdbtGO+rJUUBgK6qdf3SOPhQf3K/ybF5Miw==", + "dev": true, + "requires": { + "commander": "2.15.1", + "source-map": "0.6.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -5667,10 +8253,17 @@ "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "dev": true, "requires": { +<<<<<<< HEAD "depd": "~1.1.2", "inherits": "2.0.3", "setprototypeof": "1.1.0", "statuses": ">= 1.4.0 < 2" +======= + "depd": "1.1.2", + "inherits": "2.0.3", + "setprototypeof": "1.1.0", + "statuses": "1.4.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "http-parser-js": { @@ -5685,9 +8278,15 @@ "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==", "dev": true, "requires": { +<<<<<<< HEAD "eventemitter3": "^3.0.0", "follow-redirects": "^1.0.0", "requires-port": "^1.0.0" +======= + "eventemitter3": "3.1.0", + "follow-redirects": "1.5.0", + "requires-port": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "http-proxy-middleware": { @@ -5696,6 +8295,7 @@ "integrity": "sha1-ZC6ISIUdZvCdTxJJEoRtuutBuDM=", "dev": true, "requires": { +<<<<<<< HEAD "http-proxy": "^1.16.2", "is-glob": "^3.1.0", "lodash": "^4.17.2", @@ -5754,12 +8354,27 @@ } } }, +======= + "http-proxy": "1.17.0", + "is-glob": "3.1.0", + "lodash": "4.17.10", + "micromatch": "2.3.11" + }, + "dependencies": { + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "is-glob": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "dev": true, "requires": { +<<<<<<< HEAD "is-extglob": "^2.1.0" } }, @@ -5808,6 +8423,9 @@ "is-extglob": "^1.0.0" } } +======= + "is-extglob": "2.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -5818,9 +8436,15 @@ "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", "dev": true, "requires": { +<<<<<<< HEAD "assert-plus": "^0.2.0", "jsprim": "^1.2.2", "sshpk": "^1.7.0" +======= + "assert-plus": "0.2.0", + "jsprim": "1.4.1", + "sshpk": "1.14.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "https-browserify": { @@ -5847,7 +8471,11 @@ "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=", "dev": true, "requires": { +<<<<<<< HEAD "postcss": "^6.0.1" +======= + "postcss": "6.0.22" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "ieee754": { @@ -5868,12 +8496,21 @@ "integrity": "sha1-8Zwu7h5xumxlWMUV+fyWaAGJptQ=", "dev": true, "requires": { +<<<<<<< HEAD "file-type": "^4.1.0", "globby": "^6.1.0", "make-dir": "^1.0.0", "p-pipe": "^1.1.0", "pify": "^2.3.0", "replace-ext": "^1.0.0" +======= + "file-type": "4.4.0", + "globby": "6.1.0", + "make-dir": "1.3.0", + "p-pipe": "1.2.0", + "pify": "2.3.0", + "replace-ext": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "pify": { @@ -5890,9 +8527,15 @@ "integrity": "sha512-K01m5QuPK+0en8oVhiOOAicF7KjrHlCZxS++mfLI2mV/Ksfq/Y9nCXCWDz6jRv13wwlqe5T7hXT+ji2DnLc2yQ==", "dev": true, "requires": { +<<<<<<< HEAD "exec-buffer": "^3.0.0", "gifsicle": "^3.0.0", "is-gif": "^1.0.0" +======= + "exec-buffer": "3.2.0", + "gifsicle": "3.0.4", + "is-gif": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "imagemin-mozjpeg": { @@ -5901,9 +8544,15 @@ "integrity": "sha1-2SZHf8bvXzp2ikIi97LYCNPrpWg=", "dev": true, "requires": { +<<<<<<< HEAD "execa": "^0.8.0", "is-jpg": "^1.0.0", "mozjpeg": "^5.0.0" +======= + "execa": "0.8.0", + "is-jpg": "1.0.1", + "mozjpeg": "5.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "execa": { @@ -5912,6 +8561,7 @@ "integrity": "sha1-2NdrvBtVIX7RkP1t1J08d07PyNo=", "dev": true, "requires": { +<<<<<<< HEAD "cross-spawn": "^5.0.1", "get-stream": "^3.0.0", "is-stream": "^1.1.0", @@ -5919,6 +8569,15 @@ "p-finally": "^1.0.0", "signal-exit": "^3.0.0", "strip-eof": "^1.0.0" +======= + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -5929,9 +8588,15 @@ "integrity": "sha1-0i2kEsCfX/AKQzmWC5ioix2+hpU=", "dev": true, "requires": { +<<<<<<< HEAD "exec-buffer": "^3.0.0", "is-png": "^1.0.0", "optipng-bin": "^3.0.0" +======= + "exec-buffer": "3.2.0", + "is-png": "1.1.0", + "optipng-bin": "3.1.4" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "imagemin-pngquant": { @@ -5940,10 +8605,17 @@ "integrity": "sha512-RtIUPbp8/HYX5EKY6p/L1NLKnkxNj37I92IFNsrptzBVql8FqBgPra9DO/eUgE4EWx+zq6ih4a/Y9YhF3pNM5A==", "dev": true, "requires": { +<<<<<<< HEAD "execa": "^0.10.0", "is-png": "^1.0.0", "is-stream": "^1.1.0", "pngquant-bin": "^4.0.0" +======= + "execa": "0.10.0", + "is-png": "1.1.0", + "is-stream": "1.1.0", + "pngquant-bin": "4.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "cross-spawn": { @@ -5952,11 +8624,19 @@ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "requires": { +<<<<<<< HEAD "nice-try": "^1.0.4", "path-key": "^2.0.1", "semver": "^5.5.0", "shebang-command": "^1.2.0", "which": "^1.2.9" +======= + "nice-try": "1.0.4", + "path-key": "2.0.1", + "semver": "5.5.0", + "shebang-command": "1.2.0", + "which": "1.3.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "execa": { @@ -5965,6 +8645,7 @@ "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==", "dev": true, "requires": { +<<<<<<< HEAD "cross-spawn": "^6.0.0", "get-stream": "^3.0.0", "is-stream": "^1.1.0", @@ -5972,6 +8653,15 @@ "p-finally": "^1.0.0", "signal-exit": "^3.0.0", "strip-eof": "^1.0.0" +======= + "cross-spawn": "6.0.5", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -5982,9 +8672,15 @@ "integrity": "sha512-xwjBZQKpbkklHtJYnCOwRJjTRJA/nR0hQzKMh+CUZRvm/L0QwKKPJQ9tkPWQHrg+cydPu2i1vLgHuy2E0hKEkg==", "dev": true, "requires": { +<<<<<<< HEAD "buffer-from": "^0.1.1", "is-svg": "^2.0.0", "svgo": "^1.0.0" +======= + "buffer-from": "0.1.2", + "is-svg": "2.1.0", + "svgo": "1.0.5" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "buffer-from": { @@ -5999,7 +8695,11 @@ "integrity": "sha512-5wfTTO8E2/ja4jFSxePXlG5nRu5bBtL/r1HCIpJW/lzT6yDtKl0u0Z4o/Vpz32IpKmBn7HerheEZQgA9N2DarQ==", "dev": true, "requires": { +<<<<<<< HEAD "q": "^1.1.2" +======= + "q": "1.5.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "csso": { @@ -6017,8 +8717,13 @@ "integrity": "sha512-BAYp9FyN4jLXjfvRpTDchBllDptqlK9I7OsagXCG9Am5C+5jc8eRZHgqb9x500W2OKS14MMlpQc/nmh/aA7TEQ==", "dev": true, "requires": { +<<<<<<< HEAD "mdn-data": "^1.0.0", "source-map": "^0.5.3" +======= + "mdn-data": "1.1.3", + "source-map": "0.5.7" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -6035,6 +8740,7 @@ "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==", "dev": true, "requires": { +<<<<<<< HEAD "argparse": "^1.0.7", "esprima": "^4.0.0" } @@ -6043,6 +8749,16 @@ "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", +======= + "argparse": "1.0.10", + "esprima": "4.0.0" + } + }, + "sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "dev": true }, "svgo": { @@ -6051,6 +8767,7 @@ "integrity": "sha512-nYrifviB77aNKDNKKyuay3M9aYiK6Hv5gJVDdjj2ZXTQmI8WZc8+UPLR5IpVlktJfSu3co/4XcWgrgI6seGBPg==", "dev": true, "requires": { +<<<<<<< HEAD "coa": "~2.0.1", "colors": "~1.1.2", "css-select": "~1.3.0-rc0", @@ -6065,6 +8782,22 @@ "stable": "~0.1.6", "unquote": "~1.1.1", "util.promisify": "~1.0.0" +======= + "coa": "2.0.1", + "colors": "1.1.2", + "css-select": "1.3.0-rc0", + "css-select-base-adapter": "0.1.0", + "css-tree": "1.0.0-alpha25", + "css-url-regex": "1.1.0", + "csso": "3.5.0", + "js-yaml": "3.10.0", + "mkdirp": "0.5.1", + "object.values": "1.0.4", + "sax": "1.2.4", + "stable": "0.1.8", + "unquote": "1.1.1", + "util.promisify": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -6075,6 +8808,7 @@ "integrity": "sha512-cD5D+zzIDvVPyX9nmz6+GL20BfpRUKUEXFur9IPeUC8/LRJT/PQ3YJVyKelIum8R5rCVZXgSFB0ccpsnS4IyAQ==", "dev": true, "requires": { +<<<<<<< HEAD "imagemin": "^5.3.1", "imagemin-gifsicle": "^5.2.0", "imagemin-mozjpeg": "^7.0.0", @@ -6082,6 +8816,15 @@ "imagemin-pngquant": "^5.0.1", "imagemin-svgo": "^6.0.0", "loader-utils": "^1.1.0" +======= + "imagemin": "5.3.1", + "imagemin-gifsicle": "5.2.0", + "imagemin-mozjpeg": "7.0.0", + "imagemin-optipng": "5.2.1", + "imagemin-pngquant": "5.1.0", + "imagemin-svgo": "6.0.0", + "loader-utils": "1.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "import-local": { @@ -6090,8 +8833,13 @@ "integrity": "sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==", "dev": true, "requires": { +<<<<<<< HEAD "pkg-dir": "^2.0.0", "resolve-cwd": "^2.0.0" +======= + "pkg-dir": "2.0.0", + "resolve-cwd": "2.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "imurmurhash": { @@ -6112,7 +8860,22 @@ "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", "dev": true, "requires": { +<<<<<<< HEAD "repeating": "^2.0.0" +======= + "repeating": "2.0.1" + }, + "dependencies": { + "repeating": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", + "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", + "dev": true, + "requires": { + "is-finite": "1.0.2" + } + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "indexes-of": { @@ -6133,8 +8896,13 @@ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "requires": { +<<<<<<< HEAD "once": "^1.3.0", "wrappy": "1" +======= + "once": "1.4.0", + "wrappy": "1.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "inherits": { @@ -6155,7 +8923,11 @@ "integrity": "sha1-rp+/k7mEh4eF1QqN4bNWlWBYz1w=", "dev": true, "requires": { +<<<<<<< HEAD "meow": "^3.3.0" +======= + "meow": "3.7.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "interpret": { @@ -6170,7 +8942,11 @@ "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", "dev": true, "requires": { +<<<<<<< HEAD "loose-envify": "^1.0.0" +======= + "loose-envify": "1.3.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "invert-kv": { @@ -6203,7 +8979,11 @@ "integrity": "sha1-hHSREZ/MtftDYhfMc39/qtUPYD8=", "dev": true, "requires": { +<<<<<<< HEAD "is-relative": "^0.1.0" +======= + "is-relative": "0.1.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "is-absolute-url": { @@ -6218,6 +8998,7 @@ "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { +<<<<<<< HEAD "kind-of": "^3.0.2" }, "dependencies": { @@ -6230,6 +9011,9 @@ "is-buffer": "^1.1.5" } } +======= + "kind-of": "3.2.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "is-arrayish": { @@ -6244,7 +9028,11 @@ "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "dev": true, "requires": { +<<<<<<< HEAD "binary-extensions": "^1.0.0" +======= + "binary-extensions": "1.11.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "is-buffer": { @@ -6259,7 +9047,11 @@ "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "dev": true, "requires": { +<<<<<<< HEAD "builtin-modules": "^1.0.0" +======= + "builtin-modules": "1.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "is-bzip2": { @@ -6280,6 +9072,7 @@ "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { +<<<<<<< HEAD "kind-of": "^3.0.2" }, "dependencies": { @@ -6292,6 +9085,9 @@ "is-buffer": "^1.1.5" } } +======= + "kind-of": "3.2.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "is-date-object": { @@ -6306,9 +9102,15 @@ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "dev": true, "requires": { +<<<<<<< HEAD "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", "kind-of": "^5.0.0" +======= + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "kind-of": { @@ -6337,7 +9139,11 @@ "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", "dev": true, "requires": { +<<<<<<< HEAD "is-primitive": "^2.0.0" +======= + "is-primitive": "2.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "is-extendable": { @@ -6347,9 +9153,15 @@ "dev": true }, "is-extglob": { +<<<<<<< HEAD "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", +======= + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "dev": true }, "is-finite": { @@ -6358,6 +9170,7 @@ "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", "dev": true, "requires": { +<<<<<<< HEAD "number-is-nan": "^1.0.0" } }, @@ -6366,6 +9179,19 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true +======= + "number-is-nan": "1.0.1" + } + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "dev": true, + "requires": { + "number-is-nan": "1.0.1" + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "is-gif": { "version": "1.0.0", @@ -6374,12 +9200,21 @@ "dev": true }, "is-glob": { +<<<<<<< HEAD "version": "4.0.0", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", "dev": true, "requires": { "is-extglob": "^2.1.1" +======= + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "is-gzip": { @@ -6406,11 +9241,19 @@ "integrity": "sha512-IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg==", "dev": true, "requires": { +<<<<<<< HEAD "generate-function": "^2.0.0", "generate-object-property": "^1.1.0", "is-my-ip-valid": "^1.0.0", "jsonpointer": "^4.0.0", "xtend": "^4.0.0" +======= + "generate-function": "2.0.0", + "generate-object-property": "1.2.0", + "is-my-ip-valid": "1.0.0", + "jsonpointer": "4.0.1", + "xtend": "4.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "is-natural-number": { @@ -6420,6 +9263,7 @@ "dev": true }, "is-number": { +<<<<<<< HEAD "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", @@ -6437,6 +9281,14 @@ "is-buffer": "^1.1.5" } } +======= + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", + "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", + "dev": true, + "requires": { + "kind-of": "3.2.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "is-obj": { @@ -6457,7 +9309,11 @@ "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==", "dev": true, "requires": { +<<<<<<< HEAD "is-number": "^4.0.0" +======= + "is-number": "4.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "is-number": { @@ -6480,7 +9336,11 @@ "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", "dev": true, "requires": { +<<<<<<< HEAD "is-path-inside": "^1.0.0" +======= + "is-path-inside": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "is-path-inside": { @@ -6489,7 +9349,11 @@ "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", "dev": true, "requires": { +<<<<<<< HEAD "path-is-inside": "^1.0.1" +======= + "path-is-inside": "1.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "is-plain-obj": { @@ -6504,7 +9368,19 @@ "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "dev": true, "requires": { +<<<<<<< HEAD "isobject": "^3.0.1" +======= + "isobject": "3.0.1" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "is-png": { @@ -6543,7 +9419,11 @@ "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", "dev": true, "requires": { +<<<<<<< HEAD "has": "^1.0.1" +======= + "has": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "is-relative": { @@ -6570,7 +9450,11 @@ "integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=", "dev": true, "requires": { +<<<<<<< HEAD "html-comment-regex": "^1.1.0" +======= + "html-comment-regex": "1.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "is-symbol": { @@ -6628,9 +9512,15 @@ "dev": true }, "isarray": { +<<<<<<< HEAD "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", +======= + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "dev": true }, "isexe": { @@ -6640,10 +9530,28 @@ "dev": true }, "isobject": { +<<<<<<< HEAD "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", "dev": true +======= + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "dev": true, + "requires": { + "isarray": "1.0.0" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + } + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "isstream": { "version": "0.1.2", @@ -6657,8 +9565,13 @@ "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==", "dev": true, "requires": { +<<<<<<< HEAD "has-to-string-tag-x": "^1.2.0", "is-object": "^1.0.1" +======= + "has-to-string-tag-x": "1.4.1", + "is-object": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "jquery": { @@ -6685,8 +9598,13 @@ "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=", "dev": true, "requires": { +<<<<<<< HEAD "argparse": "^1.0.7", "esprima": "^2.6.0" +======= + "argparse": "1.0.10", + "esprima": "2.7.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "jsbn": { @@ -6720,6 +9638,7 @@ "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", "dev": true }, +<<<<<<< HEAD "json-stable-stringify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", @@ -6729,6 +9648,8 @@ "jsonify": "~0.0.0" } }, +======= +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", @@ -6753,7 +9674,11 @@ "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=", "dev": true, "requires": { +<<<<<<< HEAD "graceful-fs": "^4.1.6" +======= + "graceful-fs": "4.1.11" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "jsonify": { @@ -6795,10 +9720,20 @@ "dev": true }, "kind-of": { +<<<<<<< HEAD "version": "6.0.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "dev": true +======= + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "laravel-mix": { "version": "2.1.11", @@ -6806,6 +9741,7 @@ "integrity": "sha512-+iDqVPOuHSq6Ng/WX0w8V2O7R8847u1N1jybB/AAuRca3nRw4iI9BNNJ307ViiXb1GulxKixLe67shPFatJjvQ==", "dev": true, "requires": { +<<<<<<< HEAD "autoprefixer": "^7.2.6", "babel-core": "^6.24.1", "babel-loader": "^7.1.1", @@ -6989,6 +9925,547 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=", +======= + "autoprefixer": "7.2.6", + "babel-core": "6.26.3", + "babel-loader": "7.1.4", + "babel-plugin-transform-object-rest-spread": "6.26.0", + "babel-plugin-transform-runtime": "6.23.0", + "babel-preset-env": "1.7.0", + "chokidar": "2.0.3", + "clean-css": "4.1.11", + "concatenate": "0.0.2", + "css-loader": "0.28.11", + "dotenv": "4.0.0", + "dotenv-expand": "4.2.0", + "extract-text-webpack-plugin": "3.0.2", + "file-loader": "0.11.2", + "friendly-errors-webpack-plugin": "1.7.0", + "fs-extra": "3.0.1", + "glob": "7.1.2", + "html-loader": "0.4.5", + "img-loader": "2.0.1", + "lodash": "4.17.10", + "md5": "2.2.1", + "node-sass": "4.9.0", + "postcss-loader": "2.1.5", + "resolve-url-loader": "2.3.0", + "sass-loader": "6.0.7", + "style-loader": "0.18.2", + "uglify-js": "2.8.29", + "uglifyjs-webpack-plugin": "1.2.5", + "vue-loader": "13.7.2", + "vue-template-compiler": "2.5.16", + "webpack": "3.12.0", + "webpack-chunk-hash": "0.4.0", + "webpack-dev-server": "2.11.2", + "webpack-merge": "4.1.2", + "webpack-notifier": "1.6.0", + "yargs": "8.0.2" + }, + "dependencies": { + "anymatch": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", + "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", + "dev": true, + "requires": { + "micromatch": "3.1.10", + "normalize-path": "2.1.1" + } + }, + "arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "dev": true + }, + "array-unique": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", + "dev": true + }, + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, + "requires": { + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.2", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "chokidar": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz", + "integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==", + "dev": true, + "requires": { + "anymatch": "2.0.0", + "async-each": "1.0.1", + "braces": "2.3.2", + "fsevents": "1.2.4", + "glob-parent": "3.1.0", + "inherits": "2.0.3", + "is-binary-path": "1.0.1", + "is-glob": "4.0.0", + "normalize-path": "2.1.1", + "path-is-absolute": "1.0.1", + "readdirp": "2.1.0", + "upath": "1.1.0" + } + }, + "expand-brackets": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "dev": true, + "requires": { + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "posix-character-classes": "0.1.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, + "requires": { + "is-descriptor": "0.1.6" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + }, + "is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" + } + }, + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true + } + } + }, + "extglob": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", + "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", + "dev": true, + "requires": { + "array-unique": "0.3.2", + "define-property": "1.0.0", + "expand-brackets": "2.1.4", + "extend-shallow": "2.0.1", + "fragment-cache": "0.2.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, + "requires": { + "is-descriptor": "1.0.2" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "dev": true, + "requires": { + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "dev": true, + "requires": { + "is-glob": "3.1.0", + "path-dirname": "1.0.2" + }, + "dependencies": { + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "dev": true, + "requires": { + "is-extglob": "2.1.1" + } + } + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dev": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dev": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true + }, + "is-glob": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", + "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", + "dev": true, + "requires": { + "is-extglob": "2.1.1" + } + }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "dev": true + }, + "micromatch": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "dev": true, + "requires": { + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.2", + "nanomatch": "1.2.9", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + } + } + } + }, + "lazy-cache": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", + "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", + "dev": true + }, + "lazy-req": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz", + "integrity": "sha1-va6+rTD42CQDnODOFJ1Nqge6H6w=", + "dev": true + }, + "lazystream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz", + "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=", + "dev": true, + "requires": { + "readable-stream": "2.3.6" + } + }, + "lcid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", + "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "dev": true, + "requires": { + "invert-kv": "1.0.0" + } + }, + "load-json-file": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" + }, + "dependencies": { + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + } + } + }, + "loader-runner": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz", + "integrity": "sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI=", + "dev": true + }, + "loader-utils": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz", + "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=", + "dev": true, + "requires": { + "big.js": "3.2.0", + "emojis-list": "2.1.0", + "json5": "0.5.1" + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "dev": true, + "requires": { + "p-locate": "2.0.0", + "path-exists": "3.0.0" + } + }, + "lodash": { + "version": "4.17.10", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", + "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==", + "dev": true + }, + "lodash._baseassign": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz", + "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=", + "dev": true, + "requires": { + "lodash._basecopy": "3.0.1", + "lodash.keys": "3.1.2" + } + }, + "lodash._basecopy": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", + "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=", + "dev": true + }, + "lodash._basetostring": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", + "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=", + "dev": true + }, + "lodash._basevalues": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", + "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=", + "dev": true + }, + "lodash._bindcallback": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz", + "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4=", + "dev": true + }, + "lodash._createassigner": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz", + "integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=", + "dev": true, + "requires": { + "lodash._bindcallback": "3.0.1", + "lodash._isiterateecall": "3.0.9", + "lodash.restparam": "3.6.1" + } + }, + "lodash._getnative": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", + "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=", + "dev": true + }, + "lodash._isiterateecall": { + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", + "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=", + "dev": true + }, + "lodash._reescape": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", + "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "dev": true }, "lodash._reevaluate": { @@ -7009,12 +10486,15 @@ "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=", "dev": true }, +<<<<<<< HEAD "lodash.assign": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=", "dev": true }, +======= +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "lodash.camelcase": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", @@ -7039,7 +10519,11 @@ "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=", "dev": true, "requires": { +<<<<<<< HEAD "lodash._root": "^3.0.0" +======= + "lodash._root": "3.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "lodash.isarguments": { @@ -7066,6 +10550,7 @@ "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", "dev": true, "requires": { +<<<<<<< HEAD "lodash._getnative": "^3.0.0", "lodash.isarguments": "^3.0.0", "lodash.isarray": "^3.0.0" @@ -7077,6 +10562,13 @@ "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", "dev": true }, +======= + "lodash._getnative": "3.9.1", + "lodash.isarguments": "3.1.0", + "lodash.isarray": "3.0.4" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "lodash.mergewith": { "version": "4.6.1", "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz", @@ -7101,6 +10593,7 @@ "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", "dev": true, "requires": { +<<<<<<< HEAD "lodash._basecopy": "^3.0.0", "lodash._basetostring": "^3.0.0", "lodash._basevalues": "^3.0.0", @@ -7110,6 +10603,17 @@ "lodash.keys": "^3.0.0", "lodash.restparam": "^3.0.0", "lodash.templatesettings": "^3.0.0" +======= + "lodash._basecopy": "3.0.1", + "lodash._basetostring": "3.0.1", + "lodash._basevalues": "3.0.0", + "lodash._isiterateecall": "3.0.9", + "lodash._reinterpolate": "3.0.0", + "lodash.escape": "3.2.0", + "lodash.keys": "3.1.2", + "lodash.restparam": "3.6.1", + "lodash.templatesettings": "3.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "lodash.templatesettings": { @@ -7118,8 +10622,13 @@ "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=", "dev": true, "requires": { +<<<<<<< HEAD "lodash._reinterpolate": "^3.0.0", "lodash.escape": "^3.0.0" +======= + "lodash._reinterpolate": "3.0.0", + "lodash.escape": "3.2.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "lodash.uniq": { @@ -7134,8 +10643,13 @@ "integrity": "sha1-X46MkNME7fElMJUaVVSruMXj9VI=", "dev": true, "requires": { +<<<<<<< HEAD "figures": "^1.3.5", "squeak": "^1.0.0" +======= + "figures": "1.7.0", + "squeak": "1.3.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "loglevel": { @@ -7156,7 +10670,11 @@ "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", "dev": true, "requires": { +<<<<<<< HEAD "js-tokens": "^3.0.0" +======= + "js-tokens": "3.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "loud-rejection": { @@ -7165,8 +10683,13 @@ "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "dev": true, "requires": { +<<<<<<< HEAD "currently-unhandled": "^0.4.1", "signal-exit": "^3.0.0" +======= + "currently-unhandled": "0.4.1", + "signal-exit": "3.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "lower-case": { @@ -7187,10 +10710,17 @@ "integrity": "sha1-IfYArBwwlcPG5JfuZyce4ISB/p4=", "dev": true, "requires": { +<<<<<<< HEAD "get-stdin": "^4.0.1", "indent-string": "^2.1.0", "longest": "^1.0.0", "meow": "^3.3.0" +======= + "get-stdin": "4.0.1", + "indent-string": "2.1.0", + "longest": "1.0.1", + "meow": "3.7.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "lru-cache": { @@ -7199,6 +10729,7 @@ "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==", "dev": true, "requires": { +<<<<<<< HEAD "pseudomap": "^1.0.2", "yallist": "^2.1.2" } @@ -7209,13 +10740,23 @@ "integrity": "sha1-WQTcU3w57G2+/q6QIycTX6hRHxI=", "dev": true }, +======= + "pseudomap": "1.0.2", + "yallist": "2.1.2" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "make-dir": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", "dev": true, "requires": { +<<<<<<< HEAD "pify": "^3.0.0" +======= + "pify": "3.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "map-cache": { @@ -7236,7 +10777,11 @@ "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", "dev": true, "requires": { +<<<<<<< HEAD "object-visit": "^1.0.0" +======= + "object-visit": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "math-expression-evaluator": { @@ -7257,9 +10802,15 @@ "integrity": "sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=", "dev": true, "requires": { +<<<<<<< HEAD "charenc": "~0.0.1", "crypt": "~0.0.1", "is-buffer": "~1.1.1" +======= + "charenc": "0.0.2", + "crypt": "0.0.2", + "is-buffer": "1.1.6" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "md5.js": { @@ -7268,8 +10819,13 @@ "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=", "dev": true, "requires": { +<<<<<<< HEAD "hash-base": "^3.0.0", "inherits": "^2.0.1" +======= + "hash-base": "3.0.4", + "inherits": "2.0.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "mdn-data": { @@ -7290,7 +10846,11 @@ "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", "dev": true, "requires": { +<<<<<<< HEAD "mimic-fn": "^1.0.0" +======= + "mimic-fn": "1.2.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "memory-fs": { @@ -7299,8 +10859,13 @@ "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", "dev": true, "requires": { +<<<<<<< HEAD "errno": "^0.1.3", "readable-stream": "^2.0.1" +======= + "errno": "0.1.7", + "readable-stream": "2.3.6" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "meow": { @@ -7309,6 +10874,7 @@ "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "requires": { +<<<<<<< HEAD "camelcase-keys": "^2.0.0", "decamelize": "^1.1.2", "loud-rejection": "^1.0.0", @@ -7319,6 +10885,18 @@ "read-pkg-up": "^1.0.1", "redent": "^1.0.0", "trim-newlines": "^1.0.0" +======= + "camelcase-keys": "2.1.0", + "decamelize": "1.2.0", + "loud-rejection": "1.6.0", + "map-obj": "1.0.1", + "minimist": "1.2.0", + "normalize-package-data": "2.4.0", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "redent": "1.0.0", + "trim-newlines": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "minimist": { @@ -7341,7 +10919,11 @@ "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", "dev": true, "requires": { +<<<<<<< HEAD "readable-stream": "^2.0.1" +======= + "readable-stream": "2.3.6" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "methods": { @@ -7351,6 +10933,7 @@ "dev": true }, "micromatch": { +<<<<<<< HEAD "version": "3.1.10", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", @@ -7369,6 +10952,26 @@ "regex-not": "^1.0.0", "snapdragon": "^0.8.1", "to-regex": "^3.0.2" +======= + "version": "2.3.11", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", + "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", + "dev": true, + "requires": { + "arr-diff": "2.0.0", + "array-unique": "0.2.1", + "braces": "1.8.5", + "expand-brackets": "0.1.5", + "extglob": "0.3.2", + "filename-regex": "2.0.1", + "is-extglob": "1.0.0", + "is-glob": "2.0.1", + "kind-of": "3.2.2", + "normalize-path": "2.1.1", + "object.omit": "2.0.1", + "parse-glob": "3.0.4", + "regex-cache": "0.4.4" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "miller-rabin": { @@ -7377,8 +10980,13 @@ "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", "dev": true, "requires": { +<<<<<<< HEAD "bn.js": "^4.0.0", "brorand": "^1.0.1" +======= + "bn.js": "4.11.8", + "brorand": "1.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "mime": { @@ -7399,7 +11007,11 @@ "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", "dev": true, "requires": { +<<<<<<< HEAD "mime-db": "~1.33.0" +======= + "mime-db": "1.33.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "mimic-fn": { @@ -7432,7 +11044,11 @@ "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "requires": { +<<<<<<< HEAD "brace-expansion": "^1.1.7" +======= + "brace-expansion": "1.1.11" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "minimist": { @@ -7441,6 +11057,7 @@ "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", "dev": true }, +<<<<<<< HEAD "mississippi": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz", @@ -7469,6 +11086,24 @@ "xtend": "~4.0.1" } } +======= + "mississippi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz", + "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==", + "dev": true, + "requires": { + "concat-stream": "1.5.2", + "duplexify": "3.6.0", + "end-of-stream": "1.4.1", + "flush-write-stream": "1.0.3", + "from2": "2.3.0", + "parallel-transform": "1.1.0", + "pump": "2.0.1", + "pumpify": "1.5.1", + "stream-each": "1.2.2", + "through2": "2.0.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "mixin-deep": { @@ -7477,8 +11112,13 @@ "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", "dev": true, "requires": { +<<<<<<< HEAD "for-in": "^1.0.2", "is-extendable": "^1.0.1" +======= + "for-in": "1.0.2", + "is-extendable": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "is-extendable": { @@ -7487,7 +11127,11 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { +<<<<<<< HEAD "is-plain-object": "^2.0.4" +======= + "is-plain-object": "2.0.4" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -7498,8 +11142,13 @@ "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=", "dev": true, "requires": { +<<<<<<< HEAD "for-in": "^0.1.3", "is-extendable": "^0.1.1" +======= + "for-in": "0.1.8", + "is-extendable": "0.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "for-in": { @@ -7525,12 +11174,21 @@ "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", "dev": true, "requires": { +<<<<<<< HEAD "aproba": "^1.1.1", "copy-concurrently": "^1.0.0", "fs-write-stream-atomic": "^1.0.8", "mkdirp": "^0.5.1", "rimraf": "^2.5.4", "run-queue": "^1.0.3" +======= + "aproba": "1.2.0", + "copy-concurrently": "1.0.5", + "fs-write-stream-atomic": "1.0.10", + "mkdirp": "0.5.1", + "rimraf": "2.6.2", + "run-queue": "1.0.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "mozjpeg": { @@ -7539,9 +11197,15 @@ "integrity": "sha1-uGccSSRWijY94AP/L9OXq4P3UsU=", "dev": true, "requires": { +<<<<<<< HEAD "bin-build": "^2.2.0", "bin-wrapper": "^3.0.0", "logalot": "^2.0.0" +======= + "bin-build": "2.2.0", + "bin-wrapper": "3.0.2", + "logalot": "2.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "ms": { @@ -7556,8 +11220,13 @@ "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==", "dev": true, "requires": { +<<<<<<< HEAD "dns-packet": "^1.3.1", "thunky": "^1.0.2" +======= + "dns-packet": "1.3.1", + "thunky": "1.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "multicast-dns-service-types": { @@ -7581,6 +11250,7 @@ "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", "dev": true, "requires": { +<<<<<<< HEAD "readable-stream": "~1.1.9" } }, @@ -7590,16 +11260,28 @@ "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", "dev": true }, +======= + "readable-stream": "1.1.14" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "readable-stream": { "version": "1.1.14", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", "dev": true, "requires": { +<<<<<<< HEAD "core-util-is": "~1.0.0", "inherits": "~2.0.1", "isarray": "0.0.1", "string_decoder": "~0.10.x" +======= + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "string_decoder": { @@ -7622,6 +11304,7 @@ "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==", "dev": true, "requires": { +<<<<<<< HEAD "arr-diff": "^4.0.0", "array-unique": "^0.3.2", "define-property": "^2.0.2", @@ -7634,6 +11317,40 @@ "regex-not": "^1.0.0", "snapdragon": "^0.8.1", "to-regex": "^3.0.1" +======= + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "fragment-cache": "0.2.1", + "is-odd": "2.0.0", + "is-windows": "1.0.2", + "kind-of": "6.0.2", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "dev": true + }, + "array-unique": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", + "dev": true + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "dev": true + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "negotiator": { @@ -7666,7 +11383,11 @@ "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", "dev": true, "requires": { +<<<<<<< HEAD "lower-case": "^1.1.1" +======= + "lower-case": "1.1.4" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "node-forge": { @@ -7681,6 +11402,7 @@ "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=", "dev": true, "requires": { +<<<<<<< HEAD "fstream": "^1.0.0", "glob": "^7.0.3", "graceful-fs": "^4.1.2", @@ -7696,6 +11418,37 @@ "which": "1" }, "dependencies": { +======= + "fstream": "1.0.11", + "glob": "7.1.2", + "graceful-fs": "4.1.11", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "nopt": "3.0.1", + "npmlog": "4.1.2", + "osenv": "0.1.5", + "request": "2.79.0", + "rimraf": "2.6.2", + "semver": "5.3.0", + "tar": "2.2.1", + "which": "1.3.1" + }, + "dependencies": { + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "semver": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", @@ -7710,6 +11463,7 @@ "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==", "dev": true, "requires": { +<<<<<<< HEAD "assert": "^1.1.1", "browserify-zlib": "^0.2.0", "buffer": "^4.3.0", @@ -7732,6 +11486,30 @@ "tty-browserify": "0.0.0", "url": "^0.11.0", "util": "^0.10.3", +======= + "assert": "1.4.1", + "browserify-zlib": "0.2.0", + "buffer": "4.9.1", + "console-browserify": "1.1.0", + "constants-browserify": "1.0.0", + "crypto-browserify": "3.12.0", + "domain-browser": "1.1.7", + "events": "1.1.1", + "https-browserify": "1.0.0", + "os-browserify": "0.3.0", + "path-browserify": "0.0.0", + "process": "0.11.10", + "punycode": "1.4.1", + "querystring-es3": "0.2.1", + "readable-stream": "2.3.6", + "stream-browserify": "2.0.1", + "stream-http": "2.8.2", + "string_decoder": "1.0.3", + "timers-browserify": "2.0.10", + "tty-browserify": "0.0.0", + "url": "0.11.0", + "util": "0.10.3", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "vm-browserify": "0.0.4" }, "dependencies": { @@ -7741,16 +11519,68 @@ "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==", "dev": true }, +<<<<<<< HEAD +======= + "browserify-zlib": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", + "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", + "dev": true, + "requires": { + "pako": "1.0.6" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "buffer": { "version": "4.9.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", "dev": true, "requires": { +<<<<<<< HEAD "base64-js": "^1.0.2", "ieee754": "^1.1.4", "isarray": "^1.0.0" } +======= + "base64-js": "1.3.0", + "ieee754": "1.1.11", + "isarray": "1.0.0" + } + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "os-browserify": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", + "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=", + "dev": true + }, + "pako": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz", + "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==", + "dev": true + }, + "timers-browserify": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz", + "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==", + "dev": true, + "requires": { + "setimmediate": "1.0.5" + } + }, + "tty-browserify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", + "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", + "dev": true +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } }, @@ -7760,10 +11590,17 @@ "integrity": "sha512-MIBs+AAd6dJ2SklbbE8RUDRlIVhU8MaNLh1A9SUZDUHPiZkWLFde6UNwG41yQHZEToHgJMXqyVZ9UcS/ReOVTg==", "dev": true, "requires": { +<<<<<<< HEAD "growly": "^1.3.0", "semver": "^5.4.1", "shellwords": "^0.1.1", "which": "^1.3.0" +======= + "growly": "1.3.0", + "semver": "5.5.0", + "shellwords": "0.1.1", + "which": "1.3.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "node-sass": { @@ -7772,6 +11609,7 @@ "integrity": "sha512-QFHfrZl6lqRU3csypwviz2XLgGNOoWQbo2GOvtsfQqOfL4cy1BtWnhx/XUeAO9LT3ahBzSRXcEO6DdvAH9DzSg==", "dev": true, "requires": { +<<<<<<< HEAD "async-foreach": "^0.1.3", "chalk": "^1.1.1", "cross-spawn": "^3.0.0", @@ -7812,12 +11650,36 @@ "supports-color": "^2.0.0" } }, +======= + "async-foreach": "0.1.3", + "chalk": "1.1.3", + "cross-spawn": "3.0.1", + "gaze": "1.1.3", + "get-stdin": "4.0.1", + "glob": "7.1.2", + "in-publish": "2.0.0", + "lodash.assign": "4.2.0", + "lodash.clonedeep": "4.5.0", + "lodash.mergewith": "4.6.1", + "meow": "3.7.0", + "mkdirp": "0.5.1", + "nan": "2.10.0", + "node-gyp": "3.6.2", + "npmlog": "4.1.2", + "request": "2.79.0", + "sass-graph": "2.2.4", + "stdout-stream": "1.4.0", + "true-case-path": "1.0.2" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "cross-spawn": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", "dev": true, "requires": { +<<<<<<< HEAD "lru-cache": "^4.0.1", "which": "^1.2.9" } @@ -7826,6 +11688,30 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", +======= + "lru-cache": "4.1.3", + "which": "1.3.1" + } + }, + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "lodash.assign": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", + "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "dev": true } } @@ -7837,12 +11723,21 @@ "dev": true }, "nopt": { +<<<<<<< HEAD "version": "3.0.6", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", "dev": true, "requires": { "abbrev": "1" +======= + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz", + "integrity": "sha1-vOXEJEajKR9HYio3CrvxWPu6y/0=", + "dev": true, + "requires": { + "abbrev": "1.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "normalize-package-data": { @@ -7851,10 +11746,17 @@ "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", "dev": true, "requires": { +<<<<<<< HEAD "hosted-git-info": "^2.1.4", "is-builtin-module": "^1.0.0", "semver": "2 || 3 || 4 || 5", "validate-npm-package-license": "^3.0.1" +======= + "hosted-git-info": "2.6.0", + "is-builtin-module": "1.0.0", + "semver": "5.5.0", + "validate-npm-package-license": "3.0.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "normalize-path": { @@ -7863,7 +11765,11 @@ "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "dev": true, "requires": { +<<<<<<< HEAD "remove-trailing-separator": "^1.0.1" +======= + "remove-trailing-separator": "1.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "normalize-range": { @@ -7878,10 +11784,17 @@ "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=", "dev": true, "requires": { +<<<<<<< HEAD "object-assign": "^4.0.1", "prepend-http": "^1.0.0", "query-string": "^4.1.0", "sort-keys": "^1.0.0" +======= + "object-assign": "4.1.1", + "prepend-http": "1.0.4", + "query-string": "4.3.4", + "sort-keys": "1.1.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "npm-conf": { @@ -7890,8 +11803,13 @@ "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==", "dev": true, "requires": { +<<<<<<< HEAD "config-chain": "^1.1.11", "pify": "^3.0.0" +======= + "config-chain": "1.1.11", + "pify": "3.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "npm-run-path": { @@ -7900,7 +11818,11 @@ "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", "dev": true, "requires": { +<<<<<<< HEAD "path-key": "^2.0.0" +======= + "path-key": "2.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "npmlog": { @@ -7909,10 +11831,17 @@ "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, "requires": { +<<<<<<< HEAD "are-we-there-yet": "~1.1.2", "console-control-strings": "~1.1.0", "gauge": "~2.7.3", "set-blocking": "~2.0.0" +======= + "are-we-there-yet": "1.1.5", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "nth-check": { @@ -7921,7 +11850,11 @@ "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=", "dev": true, "requires": { +<<<<<<< HEAD "boolbase": "~1.0.0" +======= + "boolbase": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "num2fraction": { @@ -7954,9 +11887,15 @@ "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", "dev": true, "requires": { +<<<<<<< HEAD "copy-descriptor": "^0.1.0", "define-property": "^0.2.5", "kind-of": "^3.0.3" +======= + "copy-descriptor": "0.1.1", + "define-property": "0.2.5", + "kind-of": "3.2.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "define-property": { @@ -7965,6 +11904,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { +<<<<<<< HEAD "is-descriptor": "^0.1.0" } }, @@ -7975,6 +11915,9 @@ "dev": true, "requires": { "is-buffer": "^1.1.5" +======= + "is-descriptor": "0.1.6" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -7997,7 +11940,19 @@ "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", "dev": true, "requires": { +<<<<<<< HEAD "isobject": "^3.0.0" +======= + "isobject": "3.0.1" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "object.getownpropertydescriptors": { @@ -8006,8 +11961,13 @@ "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=", "dev": true, "requires": { +<<<<<<< HEAD "define-properties": "^1.1.2", "es-abstract": "^1.5.1" +======= + "define-properties": "1.1.2", + "es-abstract": "1.12.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "object.omit": { @@ -8016,8 +11976,13 @@ "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", "dev": true, "requires": { +<<<<<<< HEAD "for-own": "^0.1.4", "is-extendable": "^0.1.1" +======= + "for-own": "0.1.5", + "is-extendable": "0.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "object.pick": { @@ -8026,7 +11991,19 @@ "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", "dev": true, "requires": { +<<<<<<< HEAD "isobject": "^3.0.1" +======= + "isobject": "3.0.1" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "object.values": { @@ -8035,10 +12012,17 @@ "integrity": "sha1-5STaCbT2b/Bd9FdUbscqyZ8TBpo=", "dev": true, "requires": { +<<<<<<< HEAD "define-properties": "^1.1.2", "es-abstract": "^1.6.1", "function-bind": "^1.1.0", "has": "^1.0.1" +======= + "define-properties": "1.1.2", + "es-abstract": "1.12.0", + "function-bind": "1.1.1", + "has": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "obuf": { @@ -8068,7 +12052,11 @@ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { +<<<<<<< HEAD "wrappy": "1" +======= + "wrappy": "1.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "onetime": { @@ -8083,7 +12071,11 @@ "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==", "dev": true, "requires": { +<<<<<<< HEAD "is-wsl": "^1.1.0" +======= + "is-wsl": "1.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "optipng-bin": { @@ -8092,9 +12084,15 @@ "integrity": "sha1-ldNPLEiHBPb9cGBr/qDGWfHZXYQ=", "dev": true, "requires": { +<<<<<<< HEAD "bin-build": "^2.0.0", "bin-wrapper": "^3.0.0", "logalot": "^2.0.0" +======= + "bin-build": "2.2.0", + "bin-wrapper": "3.0.2", + "logalot": "2.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "ordered-read-streams": { @@ -8103,8 +12101,13 @@ "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=", "dev": true, "requires": { +<<<<<<< HEAD "is-stream": "^1.0.1", "readable-stream": "^2.0.1" +======= + "is-stream": "1.1.0", + "readable-stream": "2.3.6" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "original": { @@ -8113,6 +12116,7 @@ "integrity": "sha512-IEvtB5vM5ULvwnqMxWBLxkS13JIEXbakizMSo3yoPNPCIWzg8TG3Usn/UhXoZFM/m+FuEA20KdzPSFq/0rS+UA==", "dev": true, "requires": { +<<<<<<< HEAD "url-parse": "~1.4.0" } }, @@ -8122,6 +12126,11 @@ "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=", "dev": true }, +======= + "url-parse": "1.4.1" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "os-filter-obj": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/os-filter-obj/-/os-filter-obj-1.0.3.tgz", @@ -8140,7 +12149,11 @@ "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "dev": true, "requires": { +<<<<<<< HEAD "lcid": "^1.0.0" +======= + "lcid": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "os-tmpdir": { @@ -8155,8 +12168,13 @@ "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "dev": true, "requires": { +<<<<<<< HEAD "os-homedir": "^1.0.0", "os-tmpdir": "^1.0.0" +======= + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "p-cancelable": { @@ -8171,7 +12189,11 @@ "integrity": "sha1-jmtPT2XHK8W2/ii3XtqHT5akoIU=", "dev": true, "requires": { +<<<<<<< HEAD "p-timeout": "^1.1.1" +======= + "p-timeout": "1.2.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "p-finally": { @@ -8186,7 +12208,11 @@ "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==", "dev": true, "requires": { +<<<<<<< HEAD "p-try": "^1.0.0" +======= + "p-try": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "p-locate": { @@ -8195,7 +12221,11 @@ "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, "requires": { +<<<<<<< HEAD "p-limit": "^1.1.0" +======= + "p-limit": "1.2.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "p-map": { @@ -8210,7 +12240,11 @@ "integrity": "sha1-v5j+V1cFZYqeE1G++4WuTB8Hvco=", "dev": true, "requires": { +<<<<<<< HEAD "p-reduce": "^1.0.0" +======= + "p-reduce": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "p-pipe": { @@ -8231,7 +12265,11 @@ "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=", "dev": true, "requires": { +<<<<<<< HEAD "p-finally": "^1.0.0" +======= + "p-finally": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "p-try": { @@ -8240,21 +12278,30 @@ "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", "dev": true }, +<<<<<<< HEAD "pako": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz", "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==", "dev": true }, +======= +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "parallel-transform": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz", "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=", "dev": true, "requires": { +<<<<<<< HEAD "cyclist": "~0.2.2", "inherits": "^2.0.3", "readable-stream": "^2.1.5" +======= + "cyclist": "0.2.2", + "inherits": "2.0.3", + "readable-stream": "2.3.6" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "param-case": { @@ -8263,7 +12310,11 @@ "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", "dev": true, "requires": { +<<<<<<< HEAD "no-case": "^2.2.0" +======= + "no-case": "2.3.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "parse-asn1": { @@ -8272,11 +12323,19 @@ "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==", "dev": true, "requires": { +<<<<<<< HEAD "asn1.js": "^4.0.0", "browserify-aes": "^1.0.0", "create-hash": "^1.1.0", "evp_bytestokey": "^1.0.0", "pbkdf2": "^3.0.3" +======= + "asn1.js": "4.10.1", + "browserify-aes": "1.2.0", + "create-hash": "1.2.0", + "evp_bytestokey": "1.0.3", + "pbkdf2": "3.0.16" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "parse-glob": { @@ -8285,6 +12344,7 @@ "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", "dev": true, "requires": { +<<<<<<< HEAD "glob-base": "^0.3.0", "is-dotfile": "^1.0.0", "is-extglob": "^1.0.0", @@ -8306,6 +12366,12 @@ "is-extglob": "^1.0.0" } } +======= + "glob-base": "0.3.0", + "is-dotfile": "1.0.3", + "is-extglob": "1.0.0", + "is-glob": "2.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "parse-json": { @@ -8314,7 +12380,11 @@ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { +<<<<<<< HEAD "error-ex": "^1.2.0" +======= + "error-ex": "1.3.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "parseurl": { @@ -8383,9 +12453,15 @@ "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { +<<<<<<< HEAD "graceful-fs": "^4.1.2", "pify": "^2.0.0", "pinkie-promise": "^2.0.0" +======= + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "pify": { @@ -8402,11 +12478,19 @@ "integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==", "dev": true, "requires": { +<<<<<<< HEAD "create-hash": "^1.1.2", "create-hmac": "^1.1.4", "ripemd160": "^2.0.1", "safe-buffer": "^5.0.1", "sha.js": "^2.4.8" +======= + "create-hash": "1.2.0", + "create-hmac": "1.1.7", + "ripemd160": "2.0.2", + "safe-buffer": "5.1.2", + "sha.js": "2.4.11" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "pend": { @@ -8433,7 +12517,11 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { +<<<<<<< HEAD "pinkie": "^2.0.0" +======= + "pinkie": "2.0.4" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "pkg-dir": { @@ -8442,7 +12530,11 @@ "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", "dev": true, "requires": { +<<<<<<< HEAD "find-up": "^2.1.0" +======= + "find-up": "2.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "pngquant-bin": { @@ -8451,10 +12543,17 @@ "integrity": "sha512-jhjMp87bvaUeQOfNaPhSKx3tLCEwRaAycgDpIhMflgFr2+vYhw4ZrcK06eQeYg4OprXPanFljXLl5VuuAP2IHw==", "dev": true, "requires": { +<<<<<<< HEAD "bin-build": "^3.0.0", "bin-wrapper": "^3.0.0", "execa": "^0.10.0", "logalot": "^2.0.0" +======= + "bin-build": "3.0.0", + "bin-wrapper": "3.0.2", + "execa": "0.10.0", + "logalot": "2.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "bin-build": { @@ -8463,11 +12562,19 @@ "integrity": "sha512-jcUOof71/TNAI2uM5uoUaDq2ePcVBQ3R/qhxAz1rX7UfvduAL/RXD3jXzvn8cVcDJdGVkiR1shal3OH0ImpuhA==", "dev": true, "requires": { +<<<<<<< HEAD "decompress": "^4.0.0", "download": "^6.2.2", "execa": "^0.7.0", "p-map-series": "^1.0.0", "tempfile": "^2.0.0" +======= + "decompress": "4.2.0", + "download": "6.2.5", + "execa": "0.7.0", + "p-map-series": "1.0.0", + "tempfile": "2.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "execa": { @@ -8476,6 +12583,7 @@ "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", "dev": true, "requires": { +<<<<<<< HEAD "cross-spawn": "^5.0.1", "get-stream": "^3.0.0", "is-stream": "^1.1.0", @@ -8483,6 +12591,15 @@ "p-finally": "^1.0.0", "signal-exit": "^3.0.0", "strip-eof": "^1.0.0" +======= + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "get-stream": { @@ -8499,10 +12616,17 @@ "integrity": "sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==", "dev": true, "requires": { +<<<<<<< HEAD "get-proxy": "^2.0.0", "isurl": "^1.0.0-alpha5", "tunnel-agent": "^0.6.0", "url-to-options": "^1.0.1" +======= + "get-proxy": "2.1.0", + "isurl": "1.0.0", + "tunnel-agent": "0.6.0", + "url-to-options": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "decompress": { @@ -8511,6 +12635,7 @@ "integrity": "sha1-eu3YVCflqS2s/lVnSnxQXpbQH50=", "dev": true, "requires": { +<<<<<<< HEAD "decompress-tar": "^4.0.0", "decompress-tarbz2": "^4.0.0", "decompress-targz": "^4.0.0", @@ -8519,6 +12644,16 @@ "make-dir": "^1.0.0", "pify": "^2.3.0", "strip-dirs": "^2.0.0" +======= + "decompress-tar": "4.1.1", + "decompress-tarbz2": "4.1.1", + "decompress-targz": "4.1.1", + "decompress-unzip": "4.0.1", + "graceful-fs": "4.1.11", + "make-dir": "1.3.0", + "pify": "2.3.0", + "strip-dirs": "2.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "decompress-tar": { @@ -8527,9 +12662,15 @@ "integrity": "sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==", "dev": true, "requires": { +<<<<<<< HEAD "file-type": "^5.2.0", "is-stream": "^1.1.0", "tar-stream": "^1.5.2" +======= + "file-type": "5.2.0", + "is-stream": "1.1.0", + "tar-stream": "1.6.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "decompress-tarbz2": { @@ -8538,11 +12679,19 @@ "integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==", "dev": true, "requires": { +<<<<<<< HEAD "decompress-tar": "^4.1.0", "file-type": "^6.1.0", "is-stream": "^1.1.0", "seek-bzip": "^1.0.5", "unbzip2-stream": "^1.0.9" +======= + "decompress-tar": "4.1.1", + "file-type": "6.2.0", + "is-stream": "1.1.0", + "seek-bzip": "1.0.5", + "unbzip2-stream": "1.2.5" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "file-type": { @@ -8559,9 +12708,15 @@ "integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==", "dev": true, "requires": { +<<<<<<< HEAD "decompress-tar": "^4.1.1", "file-type": "^5.2.0", "is-stream": "^1.1.0" +======= + "decompress-tar": "4.1.1", + "file-type": "5.2.0", + "is-stream": "1.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "decompress-unzip": { @@ -8570,10 +12725,17 @@ "integrity": "sha1-3qrM39FK6vhVePczroIQ+bSEj2k=", "dev": true, "requires": { +<<<<<<< HEAD "file-type": "^3.8.0", "get-stream": "^2.2.0", "pify": "^2.3.0", "yauzl": "^2.4.2" +======= + "file-type": "3.9.0", + "get-stream": "2.3.1", + "pify": "2.3.0", + "yauzl": "2.9.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "file-type": { @@ -8590,6 +12752,7 @@ "integrity": "sha512-DpO9K1sXAST8Cpzb7kmEhogJxymyVUd5qz/vCOSyvwtp2Klj2XcDt5YUuasgxka44SxF0q5RriKIwJmQHG2AuA==", "dev": true, "requires": { +<<<<<<< HEAD "caw": "^2.0.0", "content-disposition": "^0.5.2", "decompress": "^4.0.0", @@ -8601,6 +12764,19 @@ "make-dir": "^1.0.0", "p-event": "^1.0.0", "pify": "^3.0.0" +======= + "caw": "2.0.1", + "content-disposition": "0.5.2", + "decompress": "4.2.0", + "ext-name": "5.0.0", + "file-type": "5.2.0", + "filenamify": "2.0.0", + "get-stream": "3.0.0", + "got": "7.1.0", + "make-dir": "1.3.0", + "p-event": "1.3.0", + "pify": "3.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "get-stream": { @@ -8623,6 +12799,7 @@ "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==", "dev": true, "requires": { +<<<<<<< HEAD "cross-spawn": "^6.0.0", "get-stream": "^3.0.0", "is-stream": "^1.1.0", @@ -8630,6 +12807,15 @@ "p-finally": "^1.0.0", "signal-exit": "^3.0.0", "strip-eof": "^1.0.0" +======= + "cross-spawn": "6.0.5", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "cross-spawn": { @@ -8638,11 +12824,19 @@ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "requires": { +<<<<<<< HEAD "nice-try": "^1.0.4", "path-key": "^2.0.1", "semver": "^5.5.0", "shebang-command": "^1.2.0", "which": "^1.2.9" +======= + "nice-try": "1.0.4", + "path-key": "2.0.1", + "semver": "5.5.0", + "shebang-command": "1.2.0", + "which": "1.3.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "get-stream": { @@ -8671,9 +12865,15 @@ "integrity": "sha1-vRYiYsC26Uv7zc8Zo7uzdk94VpU=", "dev": true, "requires": { +<<<<<<< HEAD "filename-reserved-regex": "^2.0.0", "strip-outer": "^1.0.0", "trim-repeated": "^1.0.0" +======= + "filename-reserved-regex": "2.0.0", + "strip-outer": "1.0.1", + "trim-repeated": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "get-proxy": { @@ -8682,7 +12882,11 @@ "integrity": "sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==", "dev": true, "requires": { +<<<<<<< HEAD "npm-conf": "^1.1.0" +======= + "npm-conf": "1.1.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "get-stream": { @@ -8691,8 +12895,13 @@ "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=", "dev": true, "requires": { +<<<<<<< HEAD "object-assign": "^4.0.1", "pinkie-promise": "^2.0.0" +======= + "object-assign": "4.1.1", + "pinkie-promise": "2.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "got": { @@ -8701,6 +12910,7 @@ "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==", "dev": true, "requires": { +<<<<<<< HEAD "decompress-response": "^3.2.0", "duplexer3": "^0.1.4", "get-stream": "^3.0.0", @@ -8715,6 +12925,22 @@ "timed-out": "^4.0.0", "url-parse-lax": "^1.0.0", "url-to-options": "^1.0.1" +======= + "decompress-response": "3.3.0", + "duplexer3": "0.1.4", + "get-stream": "3.0.0", + "is-plain-obj": "1.1.0", + "is-retry-allowed": "1.1.0", + "is-stream": "1.1.0", + "isurl": "1.0.0", + "lowercase-keys": "1.0.1", + "p-cancelable": "0.3.0", + "p-timeout": "1.2.1", + "safe-buffer": "5.1.2", + "timed-out": "4.0.1", + "url-parse-lax": "1.0.0", + "url-to-options": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "get-stream": { @@ -8743,7 +12969,11 @@ "integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==", "dev": true, "requires": { +<<<<<<< HEAD "is-natural-number": "^4.0.1" +======= + "is-natural-number": "4.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "timed-out": { @@ -8758,7 +12988,11 @@ "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "dev": true, "requires": { +<<<<<<< HEAD "safe-buffer": "^5.0.1" +======= + "safe-buffer": "5.1.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -8775,6 +13009,7 @@ "integrity": "sha1-uzLs2HwnEErm7kS1o8y/Drsa7ek=", "dev": true, "requires": { +<<<<<<< HEAD "async": "^1.5.2", "debug": "^2.2.0", "mkdirp": "0.5.x" @@ -8795,6 +13030,11 @@ "ms": "2.0.0" } } +======= + "async": "1.5.2", + "debug": "2.6.9", + "mkdirp": "0.5.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "posix-character-classes": { @@ -8809,9 +13049,52 @@ "integrity": "sha512-Toc9lLoUASwGqxBSJGTVcOQiDqjK+Z2XlWBg+IgYwQMY9vA2f7iMpXVc1GpPcfTSyM5lkxNo0oDwDRO+wm7XHA==", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^2.4.1", "source-map": "^0.6.1", "supports-color": "^5.4.0" +======= + "chalk": "2.4.1", + "source-map": "0.6.1", + "supports-color": "5.4.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "postcss-calc": { @@ -8820,6 +13103,7 @@ "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=", "dev": true, "requires": { +<<<<<<< HEAD "postcss": "^5.0.2", "postcss-message-helpers": "^2.0.0", "reduce-css-calc": "^1.2.6" @@ -8852,6 +13136,13 @@ } } }, +======= + "postcss": "5.2.18", + "postcss-message-helpers": "2.0.0", + "reduce-css-calc": "1.3.0" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "has-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", @@ -8864,6 +13155,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.3", "js-base64": "^2.1.9", "source-map": "^0.5.6", @@ -8876,13 +13168,25 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, +======= + "chalk": "1.1.3", + "js-base64": "2.4.5", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { +<<<<<<< HEAD "has-flag": "^1.0.0" +======= + "has-flag": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -8893,6 +13197,7 @@ "integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=", "dev": true, "requires": { +<<<<<<< HEAD "colormin": "^1.0.5", "postcss": "^5.0.13", "postcss-value-parser": "^3.2.3" @@ -8925,6 +13230,13 @@ } } }, +======= + "colormin": "1.1.2", + "postcss": "5.2.18", + "postcss-value-parser": "3.3.0" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "has-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", @@ -8937,6 +13249,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.3", "js-base64": "^2.1.9", "source-map": "^0.5.6", @@ -8949,13 +13262,25 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, +======= + "chalk": "1.1.3", + "js-base64": "2.4.5", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { +<<<<<<< HEAD "has-flag": "^1.0.0" +======= + "has-flag": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -8966,6 +13291,7 @@ "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=", "dev": true, "requires": { +<<<<<<< HEAD "postcss": "^5.0.11", "postcss-value-parser": "^3.1.2" }, @@ -8997,6 +13323,12 @@ } } }, +======= + "postcss": "5.2.18", + "postcss-value-parser": "3.3.0" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "has-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", @@ -9009,6 +13341,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.3", "js-base64": "^2.1.9", "source-map": "^0.5.6", @@ -9021,13 +13354,25 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, +======= + "chalk": "1.1.3", + "js-base64": "2.4.5", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { +<<<<<<< HEAD "has-flag": "^1.0.0" +======= + "has-flag": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -9038,6 +13383,7 @@ "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=", "dev": true, "requires": { +<<<<<<< HEAD "postcss": "^5.0.14" }, "dependencies": { @@ -9068,6 +13414,11 @@ } } }, +======= + "postcss": "5.2.18" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "has-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", @@ -9080,6 +13431,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.3", "js-base64": "^2.1.9", "source-map": "^0.5.6", @@ -9092,13 +13444,25 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, +======= + "chalk": "1.1.3", + "js-base64": "2.4.5", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { +<<<<<<< HEAD "has-flag": "^1.0.0" +======= + "has-flag": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -9109,6 +13473,7 @@ "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=", "dev": true, "requires": { +<<<<<<< HEAD "postcss": "^5.0.4" }, "dependencies": { @@ -9139,6 +13504,11 @@ } } }, +======= + "postcss": "5.2.18" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "has-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", @@ -9151,6 +13521,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.3", "js-base64": "^2.1.9", "source-map": "^0.5.6", @@ -9163,13 +13534,25 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, +======= + "chalk": "1.1.3", + "js-base64": "2.4.5", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { +<<<<<<< HEAD "has-flag": "^1.0.0" +======= + "has-flag": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -9180,6 +13563,7 @@ "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=", "dev": true, "requires": { +<<<<<<< HEAD "postcss": "^5.0.14" }, "dependencies": { @@ -9210,6 +13594,11 @@ } } }, +======= + "postcss": "5.2.18" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "has-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", @@ -9222,6 +13611,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.3", "js-base64": "^2.1.9", "source-map": "^0.5.6", @@ -9234,13 +13624,25 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, +======= + "chalk": "1.1.3", + "js-base64": "2.4.5", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { +<<<<<<< HEAD "has-flag": "^1.0.0" +======= + "has-flag": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -9249,6 +13651,7 @@ "version": "0.1.1", "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz", "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=", +<<<<<<< HEAD "dev": true, "requires": { "postcss": "^5.0.16" @@ -9281,6 +13684,13 @@ } } }, +======= + "dev": true, + "requires": { + "postcss": "5.2.18" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "has-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", @@ -9293,6 +13703,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.3", "js-base64": "^2.1.9", "source-map": "^0.5.6", @@ -9305,13 +13716,25 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, +======= + "chalk": "1.1.3", + "js-base64": "2.4.5", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { +<<<<<<< HEAD "has-flag": "^1.0.0" +======= + "has-flag": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -9322,6 +13745,7 @@ "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=", "dev": true, "requires": { +<<<<<<< HEAD "postcss": "^5.0.14", "uniqs": "^2.0.0" }, @@ -9353,6 +13777,12 @@ } } }, +======= + "postcss": "5.2.18", + "uniqs": "2.0.0" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "has-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", @@ -9365,6 +13795,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.3", "js-base64": "^2.1.9", "source-map": "^0.5.6", @@ -9377,18 +13808,31 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, +======= + "chalk": "1.1.3", + "js-base64": "2.4.5", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { +<<<<<<< HEAD "has-flag": "^1.0.0" +======= + "has-flag": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } }, "postcss-filter-plugins": { +<<<<<<< HEAD "version": "2.0.2", "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz", "integrity": "sha1-bYWGJTTXNaxCDkqFgG4fXUKG2Ew=", @@ -9425,6 +13869,16 @@ } } }, +======= + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.3.tgz", + "integrity": "sha512-T53GVFsdinJhgwm7rg1BzbeBRomOg9y5MBVhGcsV0CxurUdVj1UlPdKtn7aqYA/c/QVkzKMjq2bSV5dKG5+AwQ==", + "dev": true, + "requires": { + "postcss": "5.2.18" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "has-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", @@ -9437,6 +13891,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.3", "js-base64": "^2.1.9", "source-map": "^0.5.6", @@ -9449,13 +13904,25 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, +======= + "chalk": "1.1.3", + "js-base64": "2.4.5", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { +<<<<<<< HEAD "has-flag": "^1.0.0" +======= + "has-flag": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -9466,10 +13933,17 @@ "integrity": "sha1-U56a/J3chiASHr+djDZz4M5Q0oo=", "dev": true, "requires": { +<<<<<<< HEAD "cosmiconfig": "^2.1.0", "object-assign": "^4.1.0", "postcss-load-options": "^1.2.0", "postcss-load-plugins": "^2.3.0" +======= + "cosmiconfig": "2.2.2", + "object-assign": "4.1.1", + "postcss-load-options": "1.2.0", + "postcss-load-plugins": "2.3.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "postcss-load-options": { @@ -9478,8 +13952,13 @@ "integrity": "sha1-sJixVZ3awt8EvAuzdfmaXP4rbYw=", "dev": true, "requires": { +<<<<<<< HEAD "cosmiconfig": "^2.1.0", "object-assign": "^4.1.0" +======= + "cosmiconfig": "2.2.2", + "object-assign": "4.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "postcss-load-plugins": { @@ -9488,8 +13967,13 @@ "integrity": "sha1-dFdoEWWZrKLwCfrUJrABdQSdjZI=", "dev": true, "requires": { +<<<<<<< HEAD "cosmiconfig": "^2.1.1", "object-assign": "^4.1.0" +======= + "cosmiconfig": "2.2.2", + "object-assign": "4.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "postcss-loader": { @@ -9498,10 +13982,17 @@ "integrity": "sha512-pV7kB5neJ0/1tZ8L1uGOBNTVBCSCXQoIsZMsrwvO8V2rKGa2tBl/f80GGVxow2jJnRJ2w1ocx693EKhZAb9Isg==", "dev": true, "requires": { +<<<<<<< HEAD "loader-utils": "^1.1.0", "postcss": "^6.0.0", "postcss-load-config": "^1.2.0", "schema-utils": "^0.4.0" +======= + "loader-utils": "1.1.0", + "postcss": "6.0.22", + "postcss-load-config": "1.2.0", + "schema-utils": "0.4.5" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "ajv": { @@ -9510,10 +14001,17 @@ "integrity": "sha512-VDUX1oSajablmiyFyED9L1DFndg0P9h7p1F+NO8FkIzei6EPrR6Zu1n18rd5P8PqaSRd/FrWv3G1TVBqpM83gA==", "dev": true, "requires": { +<<<<<<< HEAD "fast-deep-equal": "^2.0.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.3.0", "uri-js": "^4.2.1" +======= + "fast-deep-equal": "2.0.1", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1", + "uri-js": "4.2.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "fast-deep-equal": { @@ -9528,8 +14026,13 @@ "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==", "dev": true, "requires": { +<<<<<<< HEAD "ajv": "^6.1.0", "ajv-keywords": "^3.1.0" +======= + "ajv": "6.5.0", + "ajv-keywords": "3.2.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -9540,6 +14043,7 @@ "integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=", "dev": true, "requires": { +<<<<<<< HEAD "has": "^1.0.1", "postcss": "^5.0.10", "postcss-value-parser": "^3.1.1" @@ -9572,6 +14076,13 @@ } } }, +======= + "has": "1.0.1", + "postcss": "5.2.18", + "postcss-value-parser": "3.3.0" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "has-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", @@ -9584,6 +14095,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.3", "js-base64": "^2.1.9", "source-map": "^0.5.6", @@ -9596,13 +14108,25 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, +======= + "chalk": "1.1.3", + "js-base64": "2.4.5", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { +<<<<<<< HEAD "has-flag": "^1.0.0" +======= + "has-flag": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -9613,6 +14137,7 @@ "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=", "dev": true, "requires": { +<<<<<<< HEAD "postcss": "^5.0.4" }, "dependencies": { @@ -9643,6 +14168,11 @@ } } }, +======= + "postcss": "5.2.18" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "has-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", @@ -9655,6 +14185,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.3", "js-base64": "^2.1.9", "source-map": "^0.5.6", @@ -9667,13 +14198,25 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, +======= + "chalk": "1.1.3", + "js-base64": "2.4.5", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { +<<<<<<< HEAD "has-flag": "^1.0.0" +======= + "has-flag": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -9684,6 +14227,7 @@ "integrity": "sha1-0d9d+qexrMO+VT8OnhDofGG19yE=", "dev": true, "requires": { +<<<<<<< HEAD "browserslist": "^1.5.2", "caniuse-api": "^1.5.2", "postcss": "^5.0.4", @@ -9697,12 +14241,22 @@ "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", "dev": true }, +======= + "browserslist": "1.7.7", + "caniuse-api": "1.6.1", + "postcss": "5.2.18", + "postcss-selector-parser": "2.2.3", + "vendors": "1.0.2" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "browserslist": { "version": "1.7.7", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "dev": true, "requires": { +<<<<<<< HEAD "caniuse-db": "^1.0.30000639", "electron-to-chromium": "^1.2.7" } @@ -9726,6 +14280,10 @@ "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", "dev": true } +======= + "caniuse-db": "1.0.30000849", + "electron-to-chromium": "1.3.48" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "has-flag": { @@ -9740,6 +14298,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.3", "js-base64": "^2.1.9", "source-map": "^0.5.6", @@ -9752,13 +14311,25 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, +======= + "chalk": "1.1.3", + "js-base64": "2.4.5", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { +<<<<<<< HEAD "has-flag": "^1.0.0" +======= + "has-flag": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -9775,6 +14346,7 @@ "integrity": "sha1-S1jttWZB66fIR0qzUmyv17vey2k=", "dev": true, "requires": { +<<<<<<< HEAD "object-assign": "^4.0.1", "postcss": "^5.0.4", "postcss-value-parser": "^3.0.2" @@ -9807,6 +14379,13 @@ } } }, +======= + "object-assign": "4.1.1", + "postcss": "5.2.18", + "postcss-value-parser": "3.3.0" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "has-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", @@ -9819,6 +14398,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.3", "js-base64": "^2.1.9", "source-map": "^0.5.6", @@ -9831,13 +14411,25 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, +======= + "chalk": "1.1.3", + "js-base64": "2.4.5", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { +<<<<<<< HEAD "has-flag": "^1.0.0" +======= + "has-flag": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -9848,6 +14440,7 @@ "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=", "dev": true, "requires": { +<<<<<<< HEAD "postcss": "^5.0.12", "postcss-value-parser": "^3.3.0" }, @@ -9879,6 +14472,12 @@ } } }, +======= + "postcss": "5.2.18", + "postcss-value-parser": "3.3.0" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "has-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", @@ -9891,6 +14490,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.3", "js-base64": "^2.1.9", "source-map": "^0.5.6", @@ -9903,13 +14503,25 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, +======= + "chalk": "1.1.3", + "js-base64": "2.4.5", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { +<<<<<<< HEAD "has-flag": "^1.0.0" +======= + "has-flag": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -9920,6 +14532,7 @@ "integrity": "sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=", "dev": true, "requires": { +<<<<<<< HEAD "alphanum-sort": "^1.0.1", "postcss": "^5.0.2", "postcss-value-parser": "^3.0.2", @@ -9953,6 +14566,14 @@ } } }, +======= + "alphanum-sort": "1.0.2", + "postcss": "5.2.18", + "postcss-value-parser": "3.3.0", + "uniqs": "2.0.0" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "has-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", @@ -9965,6 +14586,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.3", "js-base64": "^2.1.9", "source-map": "^0.5.6", @@ -9977,13 +14599,25 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, +======= + "chalk": "1.1.3", + "js-base64": "2.4.5", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { +<<<<<<< HEAD "has-flag": "^1.0.0" +======= + "has-flag": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -9994,6 +14628,7 @@ "integrity": "sha1-ssapjAByz5G5MtGkllCBFDEXNb8=", "dev": true, "requires": { +<<<<<<< HEAD "alphanum-sort": "^1.0.2", "has": "^1.0.1", "postcss": "^5.0.14", @@ -10027,6 +14662,14 @@ } } }, +======= + "alphanum-sort": "1.0.2", + "has": "1.0.1", + "postcss": "5.2.18", + "postcss-selector-parser": "2.2.3" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "has-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", @@ -10039,6 +14682,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.3", "js-base64": "^2.1.9", "source-map": "^0.5.6", @@ -10051,13 +14695,25 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, +======= + "chalk": "1.1.3", + "js-base64": "2.4.5", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { +<<<<<<< HEAD "has-flag": "^1.0.0" +======= + "has-flag": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -10068,7 +14724,11 @@ "integrity": "sha1-ZhQOzs447wa/DT41XWm/WdFB6oU=", "dev": true, "requires": { +<<<<<<< HEAD "postcss": "^6.0.1" +======= + "postcss": "6.0.22" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "postcss-modules-local-by-default": { @@ -10077,8 +14737,13 @@ "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=", "dev": true, "requires": { +<<<<<<< HEAD "css-selector-tokenizer": "^0.7.0", "postcss": "^6.0.1" +======= + "css-selector-tokenizer": "0.7.0", + "postcss": "6.0.22" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "postcss-modules-scope": { @@ -10087,8 +14752,13 @@ "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=", "dev": true, "requires": { +<<<<<<< HEAD "css-selector-tokenizer": "^0.7.0", "postcss": "^6.0.1" +======= + "css-selector-tokenizer": "0.7.0", + "postcss": "6.0.22" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "postcss-modules-values": { @@ -10097,8 +14767,13 @@ "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=", "dev": true, "requires": { +<<<<<<< HEAD "icss-replace-symbols": "^1.1.0", "postcss": "^6.0.1" +======= + "icss-replace-symbols": "1.1.0", + "postcss": "6.0.22" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "postcss-normalize-charset": { @@ -10107,6 +14782,7 @@ "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=", "dev": true, "requires": { +<<<<<<< HEAD "postcss": "^5.0.5" }, "dependencies": { @@ -10137,6 +14813,11 @@ } } }, +======= + "postcss": "5.2.18" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "has-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", @@ -10149,6 +14830,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.3", "js-base64": "^2.1.9", "source-map": "^0.5.6", @@ -10161,13 +14843,25 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, +======= + "chalk": "1.1.3", + "js-base64": "2.4.5", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { +<<<<<<< HEAD "has-flag": "^1.0.0" +======= + "has-flag": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -10178,6 +14872,7 @@ "integrity": "sha1-EI90s/L82viRov+j6kWSJ5/HgiI=", "dev": true, "requires": { +<<<<<<< HEAD "is-absolute-url": "^2.0.0", "normalize-url": "^1.4.0", "postcss": "^5.0.14", @@ -10211,6 +14906,14 @@ } } }, +======= + "is-absolute-url": "2.1.0", + "normalize-url": "1.9.1", + "postcss": "5.2.18", + "postcss-value-parser": "3.3.0" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "has-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", @@ -10223,6 +14926,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.3", "js-base64": "^2.1.9", "source-map": "^0.5.6", @@ -10235,13 +14939,25 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, +======= + "chalk": "1.1.3", + "js-base64": "2.4.5", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { +<<<<<<< HEAD "has-flag": "^1.0.0" +======= + "has-flag": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -10252,6 +14968,7 @@ "integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=", "dev": true, "requires": { +<<<<<<< HEAD "postcss": "^5.0.4", "postcss-value-parser": "^3.0.1" }, @@ -10283,6 +15000,12 @@ } } }, +======= + "postcss": "5.2.18", + "postcss-value-parser": "3.3.0" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "has-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", @@ -10295,6 +15018,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.3", "js-base64": "^2.1.9", "source-map": "^0.5.6", @@ -10307,13 +15031,25 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, +======= + "chalk": "1.1.3", + "js-base64": "2.4.5", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { +<<<<<<< HEAD "has-flag": "^1.0.0" +======= + "has-flag": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -10324,6 +15060,7 @@ "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=", "dev": true, "requires": { +<<<<<<< HEAD "postcss": "^5.0.4", "postcss-value-parser": "^3.0.2" }, @@ -10355,6 +15092,12 @@ } } }, +======= + "postcss": "5.2.18", + "postcss-value-parser": "3.3.0" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "has-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", @@ -10367,6 +15110,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.3", "js-base64": "^2.1.9", "source-map": "^0.5.6", @@ -10379,13 +15123,25 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, +======= + "chalk": "1.1.3", + "js-base64": "2.4.5", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { +<<<<<<< HEAD "has-flag": "^1.0.0" +======= + "has-flag": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -10396,6 +15152,7 @@ "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=", "dev": true, "requires": { +<<<<<<< HEAD "postcss": "^5.0.4" }, "dependencies": { @@ -10426,6 +15183,11 @@ } } }, +======= + "postcss": "5.2.18" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "has-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", @@ -10438,6 +15200,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.3", "js-base64": "^2.1.9", "source-map": "^0.5.6", @@ -10450,12 +15213,21 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, +======= + "chalk": "1.1.3", + "js-base64": "2.4.5", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { +<<<<<<< HEAD "has-flag": "^1.0.0" } } @@ -10499,6 +15271,24 @@ } } }, +======= + "has-flag": "1.0.0" + } + } + } + }, + "postcss-reduce-transforms": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz", + "integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=", + "dev": true, + "requires": { + "has": "1.0.1", + "postcss": "5.2.18", + "postcss-value-parser": "3.3.0" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "has-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", @@ -10511,6 +15301,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.3", "js-base64": "^2.1.9", "source-map": "^0.5.6", @@ -10523,13 +15314,25 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, +======= + "chalk": "1.1.3", + "js-base64": "2.4.5", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { +<<<<<<< HEAD "has-flag": "^1.0.0" +======= + "has-flag": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -10540,9 +15343,15 @@ "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=", "dev": true, "requires": { +<<<<<<< HEAD "flatten": "^1.0.2", "indexes-of": "^1.0.1", "uniq": "^1.0.1" +======= + "flatten": "1.0.2", + "indexes-of": "1.0.1", + "uniq": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "postcss-svgo": { @@ -10551,6 +15360,7 @@ "integrity": "sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=", "dev": true, "requires": { +<<<<<<< HEAD "is-svg": "^2.0.0", "postcss": "^5.0.14", "postcss-value-parser": "^3.2.3", @@ -10584,6 +15394,14 @@ } } }, +======= + "is-svg": "2.1.0", + "postcss": "5.2.18", + "postcss-value-parser": "3.3.0", + "svgo": "0.7.2" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "has-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", @@ -10596,6 +15414,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.3", "js-base64": "^2.1.9", "source-map": "^0.5.6", @@ -10608,13 +15427,25 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, +======= + "chalk": "1.1.3", + "js-base64": "2.4.5", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { +<<<<<<< HEAD "has-flag": "^1.0.0" +======= + "has-flag": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -10625,6 +15456,7 @@ "integrity": "sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=", "dev": true, "requires": { +<<<<<<< HEAD "alphanum-sort": "^1.0.1", "postcss": "^5.0.4", "uniqs": "^2.0.0" @@ -10657,6 +15489,13 @@ } } }, +======= + "alphanum-sort": "1.0.2", + "postcss": "5.2.18", + "uniqs": "2.0.0" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "has-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", @@ -10669,6 +15508,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.3", "js-base64": "^2.1.9", "source-map": "^0.5.6", @@ -10681,13 +15521,25 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, +======= + "chalk": "1.1.3", + "js-base64": "2.4.5", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { +<<<<<<< HEAD "has-flag": "^1.0.0" +======= + "has-flag": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -10704,6 +15556,7 @@ "integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=", "dev": true, "requires": { +<<<<<<< HEAD "has": "^1.0.1", "postcss": "^5.0.4", "uniqs": "^2.0.0" @@ -10736,6 +15589,13 @@ } } }, +======= + "has": "1.0.1", + "postcss": "5.2.18", + "uniqs": "2.0.0" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "has-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", @@ -10748,6 +15608,7 @@ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.1.3", "js-base64": "^2.1.9", "source-map": "^0.5.6", @@ -10760,13 +15621,25 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, +======= + "chalk": "1.1.3", + "js-base64": "2.4.5", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { +<<<<<<< HEAD "has-flag": "^1.0.0" +======= + "has-flag": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -10784,9 +15657,15 @@ "dev": true }, "prettier": { +<<<<<<< HEAD "version": "1.12.1", "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.12.1.tgz", "integrity": "sha1-wa0g6APndJ+vkFpAnSNn4Gu+cyU=", +======= + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.13.4.tgz", + "integrity": "sha512-emsEZ2bAigL1lq6ssgkpPm1MIBqgeTvcp90NxOP5XDqprub/V/WS2Hfgih3mS7/1dqTUvhG+sxx1Dv8crnVexA==", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "dev": true }, "private": { @@ -10825,7 +15704,11 @@ "integrity": "sha512-jQTChiCJteusULxjBp8+jftSQE5Obdl3k4cnmLA6WXtK6XFuWRnvVL7aCiBqaLPM8c4ph0S4tKna8XvmIwEnXQ==", "dev": true, "requires": { +<<<<<<< HEAD "forwarded": "~0.1.2", +======= + "forwarded": "0.1.2", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "ipaddr.js": "1.6.0" } }, @@ -10847,11 +15730,19 @@ "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==", "dev": true, "requires": { +<<<<<<< HEAD "bn.js": "^4.1.0", "browserify-rsa": "^4.0.0", "create-hash": "^1.1.0", "parse-asn1": "^5.0.0", "randombytes": "^2.0.1" +======= + "bn.js": "4.11.8", + "browserify-rsa": "4.0.1", + "create-hash": "1.2.0", + "parse-asn1": "5.1.1", + "randombytes": "2.0.6" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "pump": { @@ -10860,8 +15751,13 @@ "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", "dev": true, "requires": { +<<<<<<< HEAD "end-of-stream": "^1.1.0", "once": "^1.3.1" +======= + "end-of-stream": "1.4.1", + "once": "1.4.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "pumpify": { @@ -10870,9 +15766,15 @@ "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==", "dev": true, "requires": { +<<<<<<< HEAD "duplexify": "^3.6.0", "inherits": "^2.0.3", "pump": "^2.0.0" +======= + "duplexify": "3.6.0", + "inherits": "2.0.3", + "pump": "2.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "punycode": { @@ -10888,9 +15790,15 @@ "dev": true }, "qs": { +<<<<<<< HEAD "version": "6.3.2", "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz", "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=", +======= + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", + "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "dev": true }, "query-string": { @@ -10899,8 +15807,13 @@ "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=", "dev": true, "requires": { +<<<<<<< HEAD "object-assign": "^4.1.0", "strict-uri-encode": "^1.0.0" +======= + "object-assign": "4.1.1", + "strict-uri-encode": "1.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "querystring": { @@ -10927,9 +15840,15 @@ "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==", "dev": true, "requires": { +<<<<<<< HEAD "is-number": "^4.0.0", "kind-of": "^6.0.0", "math-random": "^1.0.1" +======= + "is-number": "4.0.0", + "kind-of": "6.0.2", + "math-random": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "is-number": { @@ -10937,6 +15856,15 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==", "dev": true +<<<<<<< HEAD +======= + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "dev": true +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } }, @@ -10946,7 +15874,11 @@ "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==", "dev": true, "requires": { +<<<<<<< HEAD "safe-buffer": "^5.1.0" +======= + "safe-buffer": "5.1.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "randomfill": { @@ -10955,8 +15887,13 @@ "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", "dev": true, "requires": { +<<<<<<< HEAD "randombytes": "^2.0.5", "safe-buffer": "^5.1.0" +======= + "randombytes": "2.0.6", + "safe-buffer": "5.1.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "range-parser": { @@ -10992,7 +15929,11 @@ "depd": "1.1.1", "inherits": "2.0.3", "setprototypeof": "1.0.3", +<<<<<<< HEAD "statuses": ">= 1.3.1 < 2" +======= + "statuses": "1.4.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "setprototypeof": { @@ -11004,6 +15945,7 @@ } }, "rc": { +<<<<<<< HEAD "version": "1.2.7", "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz", "integrity": "sha512-LdLD8xD4zzLsAT5xyushXDNscEjB7+2ulnl8+r1pnESlYtlJtVSoCMBGr30eDRJ3+2Gq89jK9P9e4tCEH1+ywA==", @@ -11013,6 +15955,17 @@ "ini": "~1.3.0", "minimist": "^1.2.0", "strip-json-comments": "~2.0.1" +======= + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", + "dev": true, + "requires": { + "deep-extend": "0.6.0", + "ini": "1.3.5", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "minimist": { @@ -11029,8 +15982,13 @@ "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=", "dev": true, "requires": { +<<<<<<< HEAD "pinkie-promise": "^2.0.0", "readable-stream": "^2.0.0" +======= + "pinkie-promise": "2.0.1", + "readable-stream": "2.3.6" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "read-pkg": { @@ -11039,9 +15997,15 @@ "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { +<<<<<<< HEAD "load-json-file": "^1.0.0", "normalize-package-data": "^2.3.2", "path-type": "^1.0.0" +======= + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "read-pkg-up": { @@ -11050,8 +16014,13 @@ "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, "requires": { +<<<<<<< HEAD "find-up": "^1.0.0", "read-pkg": "^1.0.0" +======= + "find-up": "1.1.2", + "read-pkg": "1.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "find-up": { @@ -11060,8 +16029,13 @@ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { +<<<<<<< HEAD "path-exists": "^2.0.0", "pinkie-promise": "^2.0.0" +======= + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "path-exists": { @@ -11070,7 +16044,11 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { +<<<<<<< HEAD "pinkie-promise": "^2.0.0" +======= + "pinkie-promise": "2.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -11081,6 +16059,7 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { +<<<<<<< HEAD "core-util-is": "~1.0.0", "inherits": "~2.0.3", "isarray": "~1.0.0", @@ -11088,6 +16067,32 @@ "safe-buffer": "~5.1.1", "string_decoder": "~1.1.1", "util-deprecate": "~1.0.1" +======= + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "5.1.2" + } + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "readdirp": { @@ -11096,10 +16101,17 @@ "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", "dev": true, "requires": { +<<<<<<< HEAD "graceful-fs": "^4.1.2", "minimatch": "^3.0.2", "readable-stream": "^2.0.2", "set-immediate-shim": "^1.0.1" +======= + "graceful-fs": "4.1.11", + "minimatch": "3.0.4", + "readable-stream": "2.3.6", + "set-immediate-shim": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "recast": { @@ -11109,9 +16121,15 @@ "dev": true, "requires": { "ast-types": "0.9.6", +<<<<<<< HEAD "esprima": "~3.1.0", "private": "~0.1.5", "source-map": "~0.5.0" +======= + "esprima": "3.1.3", + "private": "0.1.8", + "source-map": "0.5.7" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "esprima": { @@ -11119,12 +16137,15 @@ "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=", "dev": true +<<<<<<< HEAD }, "source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true +======= +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } }, @@ -11134,8 +16155,13 @@ "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", "dev": true, "requires": { +<<<<<<< HEAD "indent-string": "^2.1.0", "strip-indent": "^1.0.1" +======= + "indent-string": "2.1.0", + "strip-indent": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "reduce-css-calc": { @@ -11144,9 +16170,15 @@ "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=", "dev": true, "requires": { +<<<<<<< HEAD "balanced-match": "^0.4.2", "math-expression-evaluator": "^1.2.14", "reduce-function-call": "^1.0.1" +======= + "balanced-match": "0.4.2", + "math-expression-evaluator": "1.2.17", + "reduce-function-call": "1.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "balanced-match": { @@ -11163,7 +16195,11 @@ "integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=", "dev": true, "requires": { +<<<<<<< HEAD "balanced-match": "^0.4.2" +======= + "balanced-match": "0.4.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "balanced-match": { @@ -11192,9 +16228,15 @@ "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==", "dev": true, "requires": { +<<<<<<< HEAD "babel-runtime": "^6.18.0", "babel-types": "^6.19.0", "private": "^0.1.6" +======= + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "private": "0.1.8" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "regex-cache": { @@ -11203,7 +16245,11 @@ "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", "dev": true, "requires": { +<<<<<<< HEAD "is-equal-shallow": "^0.1.3" +======= + "is-equal-shallow": "0.1.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "regex-not": { @@ -11212,8 +16258,13 @@ "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", "dev": true, "requires": { +<<<<<<< HEAD "extend-shallow": "^3.0.2", "safe-regex": "^1.1.0" +======= + "extend-shallow": "3.0.2", + "safe-regex": "1.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "regex-parser": { @@ -11228,9 +16279,15 @@ "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=", "dev": true, "requires": { +<<<<<<< HEAD "regenerate": "^1.2.1", "regjsgen": "^0.2.0", "regjsparser": "^0.1.4" +======= + "regenerate": "1.4.0", + "regjsgen": "0.2.0", + "regjsparser": "0.1.5" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "regjsgen": { @@ -11245,7 +16302,11 @@ "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", "dev": true, "requires": { +<<<<<<< HEAD "jsesc": "~0.5.0" +======= + "jsesc": "0.5.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "jsesc": { @@ -11280,6 +16341,7 @@ "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", "dev": true }, +<<<<<<< HEAD "repeating": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", @@ -11289,6 +16351,8 @@ "is-finite": "^1.0.0" } }, +======= +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "replace-ext": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", @@ -11301,6 +16365,7 @@ "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=", "dev": true, "requires": { +<<<<<<< HEAD "aws-sign2": "~0.6.0", "aws4": "^1.2.1", "caseless": "~0.11.0", @@ -11321,6 +16386,42 @@ "tough-cookie": "~2.3.0", "tunnel-agent": "~0.4.1", "uuid": "^3.0.0" +======= + "aws-sign2": "0.6.0", + "aws4": "1.7.0", + "caseless": "0.11.0", + "combined-stream": "1.0.6", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.1.4", + "har-validator": "2.0.6", + "hawk": "3.1.3", + "http-signature": "1.1.1", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.18", + "oauth-sign": "0.8.2", + "qs": "6.3.2", + "stringstream": "0.0.6", + "tough-cookie": "2.3.4", + "tunnel-agent": "0.4.3", + "uuid": "3.2.1" + }, + "dependencies": { + "qs": { + "version": "6.3.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz", + "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=", + "dev": true + }, + "uuid": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", + "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==", + "dev": true + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "require-directory": { @@ -11353,7 +16454,11 @@ "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==", "dev": true, "requires": { +<<<<<<< HEAD "path-parse": "^1.0.5" +======= + "path-parse": "1.0.5" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "resolve-cwd": { @@ -11362,7 +16467,11 @@ "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", "dev": true, "requires": { +<<<<<<< HEAD "resolve-from": "^3.0.0" +======= + "resolve-from": "3.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "resolve-from": { @@ -11383,6 +16492,7 @@ "integrity": "sha512-RaEUWgF/B6aTg9VKaOv2o6dfm5f75/lGh8S+SQwoMcBm48WkA2nhLR+V7KEawkxXjU4lLB16IVeHCe7F69nyVw==", "dev": true, "requires": { +<<<<<<< HEAD "adjust-sourcemap-loader": "^1.1.0", "camelcase": "^4.1.0", "convert-source-map": "^1.5.1", @@ -11392,6 +16502,17 @@ "rework-visit": "^1.0.0", "source-map": "^0.5.7", "urix": "^0.1.0" +======= + "adjust-sourcemap-loader": "1.2.0", + "camelcase": "4.1.0", + "convert-source-map": "1.5.1", + "loader-utils": "1.1.0", + "lodash.defaults": "4.2.0", + "rework": "1.0.1", + "rework-visit": "1.0.0", + "source-map": "0.5.7", + "urix": "0.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "camelcase": { @@ -11400,10 +16521,17 @@ "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", "dev": true }, +<<<<<<< HEAD "source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", +======= + "convert-source-map": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz", + "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "dev": true } } @@ -11420,8 +16548,13 @@ "integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=", "dev": true, "requires": { +<<<<<<< HEAD "convert-source-map": "^0.3.3", "css": "^2.0.0" +======= + "convert-source-map": "0.3.5", + "css": "2.2.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "convert-source-map": { @@ -11444,7 +16577,11 @@ "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", "dev": true, "requires": { +<<<<<<< HEAD "align-text": "^0.1.1" +======= + "align-text": "0.1.4" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "rimraf": { @@ -11453,7 +16590,27 @@ "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "dev": true, "requires": { +<<<<<<< HEAD "glob": "^7.0.5" +======= + "glob": "7.1.2" + }, + "dependencies": { + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "ripemd160": { @@ -11462,8 +16619,13 @@ "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", "dev": true, "requires": { +<<<<<<< HEAD "hash-base": "^3.0.0", "inherits": "^2.0.1" +======= + "hash-base": "3.0.4", + "inherits": "2.0.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "run-queue": { @@ -11472,7 +16634,11 @@ "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", "dev": true, "requires": { +<<<<<<< HEAD "aproba": "^1.1.1" +======= + "aproba": "1.2.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "safe-buffer": { @@ -11487,7 +16653,11 @@ "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "dev": true, "requires": { +<<<<<<< HEAD "ret": "~0.1.10" +======= + "ret": "0.1.15" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "sass-graph": { @@ -11496,10 +16666,17 @@ "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=", "dev": true, "requires": { +<<<<<<< HEAD "glob": "^7.0.0", "lodash": "^4.0.0", "scss-tokenizer": "^0.2.3", "yargs": "^7.0.0" +======= + "glob": "7.1.2", + "lodash": "4.17.10", + "scss-tokenizer": "0.2.3", + "yargs": "7.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "camelcase": { @@ -11508,6 +16685,7 @@ "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", "dev": true }, +<<<<<<< HEAD "is-fullwidth-code-point": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", @@ -11515,6 +16693,20 @@ "dev": true, "requires": { "number-is-nan": "^1.0.0" +======= + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "string-width": { @@ -11523,9 +16715,15 @@ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { +<<<<<<< HEAD "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", "strip-ansi": "^3.0.0" +======= + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "yargs": { @@ -11534,6 +16732,7 @@ "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", "dev": true, "requires": { +<<<<<<< HEAD "camelcase": "^3.0.0", "cliui": "^3.2.0", "decamelize": "^1.1.1", @@ -11547,6 +16746,21 @@ "which-module": "^1.0.0", "y18n": "^3.2.1", "yargs-parser": "^5.0.0" +======= + "camelcase": "3.0.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "y18n": "3.2.1", + "yargs-parser": "5.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -11557,6 +16771,7 @@ "integrity": "sha512-JoiyD00Yo1o61OJsoP2s2kb19L1/Y2p3QFcCdWdF6oomBGKVYuZyqHWemRBfQ2uGYsk+CH3eCguXNfpjzlcpaA==", "dev": true, "requires": { +<<<<<<< HEAD "clone-deep": "^2.0.1", "loader-utils": "^1.0.1", "lodash.tail": "^4.1.1", @@ -11570,13 +16785,26 @@ "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "dev": true }, +======= + "clone-deep": "2.0.2", + "loader-utils": "1.1.0", + "lodash.tail": "4.1.1", + "neo-async": "2.5.1", + "pify": "3.0.0" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "schema-utils": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", "dev": true, "requires": { +<<<<<<< HEAD "ajv": "^5.0.0" +======= + "ajv": "5.5.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "scss-tokenizer": { @@ -11585,8 +16813,13 @@ "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", "dev": true, "requires": { +<<<<<<< HEAD "js-base64": "^2.1.8", "source-map": "^0.4.2" +======= + "js-base64": "2.4.5", + "source-map": "0.4.4" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "source-map": { @@ -11595,7 +16828,11 @@ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { +<<<<<<< HEAD "amdefine": ">=0.0.4" +======= + "amdefine": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -11606,7 +16843,11 @@ "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=", "dev": true, "requires": { +<<<<<<< HEAD "commander": "~2.8.1" +======= + "commander": "2.8.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "commander": { @@ -11615,7 +16856,11 @@ "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=", "dev": true, "requires": { +<<<<<<< HEAD "graceful-readlink": ">= 1.0.0" +======= + "graceful-readlink": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -11653,7 +16898,11 @@ "integrity": "sha1-V/Qd5pcHpicJp+AQS6IRcQnqR+g=", "dev": true, "requires": { +<<<<<<< HEAD "semver": "^5.3.0" +======= + "semver": "5.5.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "send": { @@ -11663,6 +16912,7 @@ "dev": true, "requires": { "debug": "2.6.9", +<<<<<<< HEAD "depd": "~1.1.2", "destroy": "~1.0.4", "encodeurl": "~1.0.2", @@ -11686,6 +16936,20 @@ "ms": "2.0.0" } } +======= + "depd": "1.1.2", + "destroy": "1.0.4", + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "etag": "1.8.1", + "fresh": "0.5.2", + "http-errors": "1.6.3", + "mime": "1.4.1", + "ms": "2.0.0", + "on-finished": "2.3.0", + "range-parser": "1.2.0", + "statuses": "1.4.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "serialize-javascript": { @@ -11700,6 +16964,7 @@ "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", "dev": true, "requires": { +<<<<<<< HEAD "accepts": "~1.3.4", "batch": "0.6.1", "debug": "2.6.9", @@ -11718,6 +16983,15 @@ "ms": "2.0.0" } } +======= + "accepts": "1.3.5", + "batch": "0.6.1", + "debug": "2.6.9", + "escape-html": "1.0.3", + "http-errors": "1.6.3", + "mime-types": "2.1.18", + "parseurl": "1.3.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "serve-static": { @@ -11726,9 +17000,15 @@ "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==", "dev": true, "requires": { +<<<<<<< HEAD "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "parseurl": "~1.3.2", +======= + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "parseurl": "1.3.2", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "send": "0.16.2" } }, @@ -11750,10 +17030,17 @@ "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", "dev": true, "requires": { +<<<<<<< HEAD "extend-shallow": "^2.0.1", "is-extendable": "^0.1.1", "is-plain-object": "^2.0.3", "split-string": "^3.0.1" +======= + "extend-shallow": "2.0.1", + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "split-string": "3.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "extend-shallow": { @@ -11762,7 +17049,11 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { +<<<<<<< HEAD "is-extendable": "^0.1.0" +======= + "is-extendable": "0.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -11785,8 +17076,13 @@ "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", "dev": true, "requires": { +<<<<<<< HEAD "inherits": "^2.0.1", "safe-buffer": "^5.0.1" +======= + "inherits": "2.0.3", + "safe-buffer": "5.1.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "shallow-clone": { @@ -11795,9 +17091,15 @@ "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==", "dev": true, "requires": { +<<<<<<< HEAD "is-extendable": "^0.1.1", "kind-of": "^5.0.0", "mixin-object": "^2.0.1" +======= + "is-extendable": "0.1.1", + "kind-of": "5.1.0", + "mixin-object": "2.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "kind-of": { @@ -11814,7 +17116,11 @@ "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "requires": { +<<<<<<< HEAD "shebang-regex": "^1.0.0" +======= + "shebang-regex": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "shebang-regex": { @@ -11847,6 +17153,7 @@ "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", "dev": true, "requires": { +<<<<<<< HEAD "base": "^0.11.1", "debug": "^2.2.0", "define-property": "^0.2.5", @@ -11866,13 +17173,29 @@ "ms": "2.0.0" } }, +======= + "base": "0.11.2", + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "map-cache": "0.2.2", + "source-map": "0.5.7", + "source-map-resolve": "0.5.2", + "use": "3.1.0" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "define-property": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { +<<<<<<< HEAD "is-descriptor": "^0.1.0" +======= + "is-descriptor": "0.1.6" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "extend-shallow": { @@ -11881,6 +17204,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { +<<<<<<< HEAD "is-extendable": "^0.1.0" } }, @@ -11889,6 +17213,10 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true +======= + "is-extendable": "0.1.1" + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } }, @@ -11898,9 +17226,15 @@ "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", "dev": true, "requires": { +<<<<<<< HEAD "define-property": "^1.0.0", "isobject": "^3.0.0", "snapdragon-util": "^3.0.1" +======= + "define-property": "1.0.0", + "isobject": "3.0.1", + "snapdragon-util": "3.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "define-property": { @@ -11909,7 +17243,11 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { +<<<<<<< HEAD "is-descriptor": "^1.0.0" +======= + "is-descriptor": "1.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "is-accessor-descriptor": { @@ -11918,7 +17256,11 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { +<<<<<<< HEAD "kind-of": "^6.0.0" +======= + "kind-of": "6.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "is-data-descriptor": { @@ -11927,7 +17269,11 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { +<<<<<<< HEAD "kind-of": "^6.0.0" +======= + "kind-of": "6.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "is-descriptor": { @@ -11936,10 +17282,29 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { +<<<<<<< HEAD "is-accessor-descriptor": "^1.0.0", "is-data-descriptor": "^1.0.0", "kind-of": "^6.0.2" } +======= + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "dev": true +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } }, @@ -11949,6 +17314,7 @@ "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", "dev": true, "requires": { +<<<<<<< HEAD "kind-of": "^3.2.0" }, "dependencies": { @@ -11961,6 +17327,9 @@ "is-buffer": "^1.1.5" } } +======= + "kind-of": "3.2.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "sntp": { @@ -11969,7 +17338,11 @@ "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", "dev": true, "requires": { +<<<<<<< HEAD "hoek": "2.x.x" +======= + "hoek": "2.16.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "sockjs": { @@ -11978,8 +17351,21 @@ "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==", "dev": true, "requires": { +<<<<<<< HEAD "faye-websocket": "^0.10.0", "uuid": "^3.0.1" +======= + "faye-websocket": "0.10.0", + "uuid": "3.2.1" + }, + "dependencies": { + "uuid": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", + "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==", + "dev": true + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "sockjs-client": { @@ -11988,6 +17374,7 @@ "integrity": "sha1-W6vjhrd15M8U51IJEUUmVAFsixI=", "dev": true, "requires": { +<<<<<<< HEAD "debug": "^2.6.6", "eventsource": "0.1.6", "faye-websocket": "~0.11.0", @@ -12005,13 +17392,27 @@ "ms": "2.0.0" } }, +======= + "debug": "2.6.9", + "eventsource": "0.1.6", + "faye-websocket": "0.11.1", + "inherits": "2.0.3", + "json3": "3.3.2", + "url-parse": "1.4.1" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "faye-websocket": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz", "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=", "dev": true, "requires": { +<<<<<<< HEAD "websocket-driver": ">=0.5.1" +======= + "websocket-driver": "0.7.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -12022,7 +17423,11 @@ "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=", "dev": true, "requires": { +<<<<<<< HEAD "is-plain-obj": "^1.0.0" +======= + "is-plain-obj": "1.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "sort-keys-length": { @@ -12031,7 +17436,11 @@ "integrity": "sha1-nLb09OnkgVWmqgZx7dM2/xR5oYg=", "dev": true, "requires": { +<<<<<<< HEAD "sort-keys": "^1.0.0" +======= + "sort-keys": "1.1.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "source-list-map": { @@ -12041,9 +17450,15 @@ "dev": true }, "source-map": { +<<<<<<< HEAD "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", +======= + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "dev": true }, "source-map-resolve": { @@ -12052,11 +17467,19 @@ "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", "dev": true, "requires": { +<<<<<<< HEAD "atob": "^2.1.1", "decode-uri-component": "^0.2.0", "resolve-url": "^0.2.1", "source-map-url": "^0.4.0", "urix": "^0.1.0" +======= + "atob": "2.1.1", + "decode-uri-component": "0.2.0", + "resolve-url": "0.2.1", + "source-map-url": "0.4.0", + "urix": "0.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "source-map-support": { @@ -12065,6 +17488,7 @@ "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", "dev": true, "requires": { +<<<<<<< HEAD "source-map": "^0.5.6" }, "dependencies": { @@ -12074,6 +17498,9 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true } +======= + "source-map": "0.5.7" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "source-map-url": { @@ -12094,8 +17521,13 @@ "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==", "dev": true, "requires": { +<<<<<<< HEAD "spdx-expression-parse": "^3.0.0", "spdx-license-ids": "^3.0.0" +======= + "spdx-expression-parse": "3.0.0", + "spdx-license-ids": "3.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "spdx-exceptions": { @@ -12110,8 +17542,13 @@ "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", "dev": true, "requires": { +<<<<<<< HEAD "spdx-exceptions": "^2.1.0", "spdx-license-ids": "^3.0.0" +======= + "spdx-exceptions": "2.1.0", + "spdx-license-ids": "3.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "spdx-license-ids": { @@ -12126,6 +17563,7 @@ "integrity": "sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=", "dev": true, "requires": { +<<<<<<< HEAD "debug": "^2.6.8", "handle-thing": "^1.2.5", "http-deceiver": "^1.2.7", @@ -12143,6 +17581,14 @@ "ms": "2.0.0" } } +======= + "debug": "2.6.9", + "handle-thing": "1.2.5", + "http-deceiver": "1.2.7", + "safe-buffer": "5.1.2", + "select-hose": "2.0.0", + "spdy-transport": "2.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "spdy-transport": { @@ -12151,6 +17597,7 @@ "integrity": "sha512-bpUeGpZcmZ692rrTiqf9/2EUakI6/kXX1Rpe0ib/DyOzbiexVfXkw6GnvI9hVGvIwVaUhkaBojjCZwLNRGQg1g==", "dev": true, "requires": { +<<<<<<< HEAD "debug": "^2.6.8", "detect-node": "^2.0.3", "hpack.js": "^2.1.6", @@ -12169,6 +17616,15 @@ "ms": "2.0.0" } } +======= + "debug": "2.6.9", + "detect-node": "2.0.3", + "hpack.js": "2.1.6", + "obuf": "1.1.2", + "readable-stream": "2.3.6", + "safe-buffer": "5.1.2", + "wbuf": "1.7.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "split-string": { @@ -12177,7 +17633,11 @@ "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", "dev": true, "requires": { +<<<<<<< HEAD "extend-shallow": "^3.0.0" +======= + "extend-shallow": "3.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "sprintf-js": { @@ -12192,6 +17652,7 @@ "integrity": "sha1-MwRQN7ZDiLVnZ0uEMiplIQc5FsM=", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.0.0", "console-stream": "^0.1.1", "lpad-align": "^1.0.1" @@ -12222,6 +17683,11 @@ "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", "dev": true } +======= + "chalk": "1.1.3", + "console-stream": "0.1.1", + "lpad-align": "1.1.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "sshpk": { @@ -12230,6 +17696,7 @@ "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=", "dev": true, "requires": { +<<<<<<< HEAD "asn1": "~0.2.3", "assert-plus": "^1.0.0", "bcrypt-pbkdf": "^1.0.0", @@ -12238,6 +17705,16 @@ "getpass": "^0.1.1", "jsbn": "~0.1.0", "tweetnacl": "~0.14.0" +======= + "asn1": "0.2.3", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.1", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.1", + "getpass": "0.1.7", + "jsbn": "0.1.1", + "tweetnacl": "0.14.5" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "assert-plus": { @@ -12254,7 +17731,11 @@ "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==", "dev": true, "requires": { +<<<<<<< HEAD "safe-buffer": "^5.1.1" +======= + "safe-buffer": "5.1.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "stable": { @@ -12281,8 +17762,13 @@ "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", "dev": true, "requires": { +<<<<<<< HEAD "define-property": "^0.2.5", "object-copy": "^0.1.0" +======= + "define-property": "0.2.5", + "object-copy": "0.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "define-property": { @@ -12291,7 +17777,11 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { +<<<<<<< HEAD "is-descriptor": "^0.1.0" +======= + "is-descriptor": "0.1.6" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -12308,7 +17798,11 @@ "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=", "dev": true, "requires": { +<<<<<<< HEAD "readable-stream": "^2.0.1" +======= + "readable-stream": "2.3.6" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "stream-browserify": { @@ -12317,8 +17811,13 @@ "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=", "dev": true, "requires": { +<<<<<<< HEAD "inherits": "~2.0.1", "readable-stream": "^2.0.2" +======= + "inherits": "2.0.3", + "readable-stream": "2.3.6" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "stream-combiner2": { @@ -12327,8 +17826,13 @@ "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=", "dev": true, "requires": { +<<<<<<< HEAD "duplexer2": "~0.1.0", "readable-stream": "^2.0.2" +======= + "duplexer2": "0.1.4", + "readable-stream": "2.3.6" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "stream-each": { @@ -12337,8 +17841,13 @@ "integrity": "sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==", "dev": true, "requires": { +<<<<<<< HEAD "end-of-stream": "^1.1.0", "stream-shift": "^1.0.0" +======= + "end-of-stream": "1.4.1", + "stream-shift": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "stream-http": { @@ -12347,11 +17856,19 @@ "integrity": "sha512-QllfrBhqF1DPcz46WxKTs6Mz1Bpc+8Qm6vbqOpVav5odAXwbyzwnEczoWqtxrsmlO+cJqtPrp/8gWKWjaKLLlA==", "dev": true, "requires": { +<<<<<<< HEAD "builtin-status-codes": "^3.0.0", "inherits": "^2.0.1", "readable-stream": "^2.3.6", "to-arraybuffer": "^1.0.0", "xtend": "^4.0.0" +======= + "builtin-status-codes": "3.0.0", + "inherits": "2.0.3", + "readable-stream": "2.3.6", + "to-arraybuffer": "1.0.1", + "xtend": "4.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "stream-shift": { @@ -12372,8 +17889,13 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { +<<<<<<< HEAD "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^4.0.0" +======= + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "ansi-regex": { @@ -12382,24 +17904,46 @@ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "dev": true }, +<<<<<<< HEAD +======= + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "strip-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { +<<<<<<< HEAD "ansi-regex": "^3.0.0" +======= + "ansi-regex": "3.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } }, "string_decoder": { +<<<<<<< HEAD "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { "safe-buffer": "~5.1.0" +======= + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "stringstream": { @@ -12414,7 +17958,11 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { +<<<<<<< HEAD "ansi-regex": "^2.0.0" +======= + "ansi-regex": "2.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "strip-bom": { @@ -12423,7 +17971,11 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { +<<<<<<< HEAD "is-utf8": "^0.2.0" +======= + "is-utf8": "0.2.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "strip-bom-stream": { @@ -12432,8 +17984,13 @@ "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=", "dev": true, "requires": { +<<<<<<< HEAD "first-chunk-stream": "^1.0.0", "strip-bom": "^2.0.0" +======= + "first-chunk-stream": "1.0.0", + "strip-bom": "2.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "strip-dirs": { @@ -12442,6 +17999,7 @@ "integrity": "sha1-lgu9EoeETzl1pFWKoQOoJV4kVqA=", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.0.0", "get-stdin": "^4.0.1", "is-absolute": "^0.1.5", @@ -12469,17 +18027,30 @@ "supports-color": "^2.0.0" } }, +======= + "chalk": "1.1.3", + "get-stdin": "4.0.1", + "is-absolute": "0.1.7", + "is-natural-number": "2.1.1", + "minimist": "1.2.0", + "sum-up": "1.0.3" + }, + "dependencies": { +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "minimist": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true +<<<<<<< HEAD }, "supports-color": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", "dev": true +======= +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } }, @@ -12495,7 +18066,11 @@ "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", "dev": true, "requires": { +<<<<<<< HEAD "get-stdin": "^4.0.1" +======= + "get-stdin": "4.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "strip-json-comments": { @@ -12510,7 +18085,11 @@ "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==", "dev": true, "requires": { +<<<<<<< HEAD "escape-string-regexp": "^1.0.2" +======= + "escape-string-regexp": "1.0.5" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "style-loader": { @@ -12519,8 +18098,13 @@ "integrity": "sha512-WPpJPZGUxWYHWIUMNNOYqql7zh85zGmr84FdTVWq52WTIkqlW9xSxD3QYWi/T31cqn9UNSsietVEgGn2aaSCzw==", "dev": true, "requires": { +<<<<<<< HEAD "loader-utils": "^1.0.2", "schema-utils": "^0.3.0" +======= + "loader-utils": "1.1.0", + "schema-utils": "0.3.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "sum-up": { @@ -12529,6 +18113,7 @@ "integrity": "sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4=", "dev": true, "requires": { +<<<<<<< HEAD "chalk": "^1.0.0" }, "dependencies": { @@ -12567,6 +18152,16 @@ "requires": { "has-flag": "^3.0.0" } +======= + "chalk": "1.1.3" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "dev": true +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "svgo": { "version": "0.7.2", @@ -12574,6 +18169,7 @@ "integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=", "dev": true, "requires": { +<<<<<<< HEAD "coa": "~1.0.1", "colors": "~1.1.2", "csso": "~2.3.1", @@ -12581,6 +18177,23 @@ "mkdirp": "~0.5.1", "sax": "~1.2.1", "whet.extend": "~0.9.9" +======= + "coa": "1.0.4", + "colors": "1.1.2", + "csso": "2.3.2", + "js-yaml": "3.7.0", + "mkdirp": "0.5.1", + "sax": "1.2.4", + "whet.extend": "0.9.9" + }, + "dependencies": { + "sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", + "dev": true + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "tapable": { @@ -12595,9 +18208,15 @@ "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", "dev": true, "requires": { +<<<<<<< HEAD "block-stream": "*", "fstream": "^1.0.2", "inherits": "2" +======= + "block-stream": "0.0.9", + "fstream": "1.0.11", + "inherits": "2.0.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "tar-stream": { @@ -12606,6 +18225,7 @@ "integrity": "sha512-IFLM5wp3QrJODQFPm6/to3LJZrONdBY/otxcvDIQzu217zKye6yVR3hhi9lAjrC2Z+m/j5oDxMPb1qcd8cIvpA==", "dev": true, "requires": { +<<<<<<< HEAD "bl": "^1.0.0", "buffer-alloc": "^1.1.0", "end-of-stream": "^1.0.0", @@ -12613,6 +18233,15 @@ "readable-stream": "^2.3.0", "to-buffer": "^1.1.0", "xtend": "^4.0.0" +======= + "bl": "1.2.2", + "buffer-alloc": "1.2.0", + "end-of-stream": "1.4.1", + "fs-constants": "1.0.0", + "readable-stream": "2.3.6", + "to-buffer": "1.1.1", + "xtend": "4.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "temp-dir": { @@ -12627,8 +18256,21 @@ "integrity": "sha1-awRGhWqbERTRhW/8vlCczLCXcmU=", "dev": true, "requires": { +<<<<<<< HEAD "temp-dir": "^1.0.0", "uuid": "^3.0.1" +======= + "temp-dir": "1.0.0", + "uuid": "3.2.1" + }, + "dependencies": { + "uuid": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", + "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==", + "dev": true + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "through": { @@ -12638,6 +18280,7 @@ "dev": true }, "through2": { +<<<<<<< HEAD "version": "0.6.5", "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", @@ -12671,6 +18314,15 @@ "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", "dev": true } +======= + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", + "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", + "dev": true, + "requires": { + "readable-stream": "2.3.6", + "xtend": "4.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "through2-filter": { @@ -12679,6 +18331,7 @@ "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=", "dev": true, "requires": { +<<<<<<< HEAD "through2": "~2.0.0", "xtend": "~4.0.0" }, @@ -12693,6 +18346,10 @@ "xtend": "~4.0.1" } } +======= + "through2": "2.0.3", + "xtend": "4.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "thunky": { @@ -12707,6 +18364,7 @@ "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=", "dev": true }, +<<<<<<< HEAD "timed-out": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz", @@ -12722,13 +18380,19 @@ "setimmediate": "^1.0.4" } }, +======= +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "to-absolute-glob": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz", "integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=", "dev": true, "requires": { +<<<<<<< HEAD "extend-shallow": "^2.0.1" +======= + "extend-shallow": "2.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "extend-shallow": { @@ -12737,7 +18401,11 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { +<<<<<<< HEAD "is-extendable": "^0.1.0" +======= + "is-extendable": "0.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -12766,6 +18434,7 @@ "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "dev": true, "requires": { +<<<<<<< HEAD "kind-of": "^3.0.2" }, "dependencies": { @@ -12778,6 +18447,9 @@ "is-buffer": "^1.1.5" } } +======= + "kind-of": "3.2.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "to-regex": { @@ -12786,10 +18458,17 @@ "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", "dev": true, "requires": { +<<<<<<< HEAD "define-property": "^2.0.2", "extend-shallow": "^3.0.2", "regex-not": "^1.0.2", "safe-regex": "^1.1.0" +======= + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "regex-not": "1.0.2", + "safe-regex": "1.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "to-regex-range": { @@ -12798,8 +18477,24 @@ "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, "requires": { +<<<<<<< HEAD "is-number": "^3.0.0", "repeat-string": "^1.6.1" +======= + "is-number": "3.0.0", + "repeat-string": "1.6.1" + }, + "dependencies": { + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + } + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "tough-cookie": { @@ -12808,7 +18503,11 @@ "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", "dev": true, "requires": { +<<<<<<< HEAD "punycode": "^1.4.1" +======= + "punycode": "1.4.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "trim-newlines": { @@ -12823,7 +18522,11 @@ "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=", "dev": true, "requires": { +<<<<<<< HEAD "escape-string-regexp": "^1.0.2" +======= + "escape-string-regexp": "1.0.5" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "trim-right": { @@ -12838,7 +18541,11 @@ "integrity": "sha1-fskRMJJHZsf1c74wIMNPj9/QDWI=", "dev": true, "requires": { +<<<<<<< HEAD "glob": "^6.0.4" +======= + "glob": "6.0.4" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "glob": { @@ -12847,21 +18554,32 @@ "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", "dev": true, "requires": { +<<<<<<< HEAD "inflight": "^1.0.4", "inherits": "2", "minimatch": "2 || 3", "once": "^1.3.0", "path-is-absolute": "^1.0.0" +======= + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } }, +<<<<<<< HEAD "tty-browserify": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", "dev": true }, +======= +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "tunnel-agent": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz", @@ -12882,7 +18600,11 @@ "dev": true, "requires": { "media-typer": "0.3.0", +<<<<<<< HEAD "mime-types": "~2.1.18" +======= + "mime-types": "2.1.18" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "typedarray": { @@ -12897,9 +18619,15 @@ "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", "dev": true, "requires": { +<<<<<<< HEAD "source-map": "~0.5.1", "uglify-to-browserify": "~1.0.0", "yargs": "~3.10.0" +======= + "source-map": "0.5.7", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "camelcase": { @@ -12914,6 +18642,7 @@ "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", "dev": true, "requires": { +<<<<<<< HEAD "center-align": "^0.1.1", "right-align": "^0.1.1", "wordwrap": "0.0.2" @@ -12925,15 +18654,28 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, +======= + "center-align": "0.1.3", + "right-align": "0.1.3", + "wordwrap": "0.0.2" + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "yargs": { "version": "3.10.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", "dev": true, "requires": { +<<<<<<< HEAD "camelcase": "^1.0.2", "cliui": "^2.1.0", "decamelize": "^1.0.0", +======= + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "window-size": "0.1.0" } } @@ -12952,6 +18694,7 @@ "integrity": "sha512-hIQJ1yxAPhEA2yW/i7Fr+SXZVMp+VEI3d42RTHBgQd2yhp/1UdBcR3QEWPV5ahBxlqQDMEMTuTEvDHSFINfwSw==", "dev": true, "requires": { +<<<<<<< HEAD "cacache": "^10.0.4", "find-cache-dir": "^1.0.0", "schema-utils": "^0.4.5", @@ -12960,6 +18703,16 @@ "uglify-es": "^3.3.4", "webpack-sources": "^1.1.0", "worker-farm": "^1.5.2" +======= + "cacache": "10.0.4", + "find-cache-dir": "1.0.0", + "schema-utils": "0.4.5", + "serialize-javascript": "1.5.0", + "source-map": "0.6.1", + "uglify-es": "3.3.9", + "webpack-sources": "1.1.0", + "worker-farm": "1.6.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "ajv": { @@ -12968,10 +18721,17 @@ "integrity": "sha512-VDUX1oSajablmiyFyED9L1DFndg0P9h7p1F+NO8FkIzei6EPrR6Zu1n18rd5P8PqaSRd/FrWv3G1TVBqpM83gA==", "dev": true, "requires": { +<<<<<<< HEAD "fast-deep-equal": "^2.0.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.3.0", "uri-js": "^4.2.1" +======= + "fast-deep-equal": "2.0.1", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1", + "uri-js": "4.2.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "commander": { @@ -12992,18 +18752,36 @@ "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==", "dev": true, "requires": { +<<<<<<< HEAD "ajv": "^6.1.0", "ajv-keywords": "^3.1.0" } }, +======= + "ajv": "6.5.0", + "ajv-keywords": "3.2.0" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "uglify-es": { "version": "3.3.9", "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz", "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==", "dev": true, "requires": { +<<<<<<< HEAD "commander": "~2.13.0", "source-map": "~0.6.1" +======= + "commander": "2.13.0", + "source-map": "0.6.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -13014,8 +18792,32 @@ "integrity": "sha512-izD3jxT8xkzwtXRUZjtmRwKnZoeECrfZ8ra/ketwOcusbZEp4mjULMnJOCfTDZBgGQAAY1AJ/IgxcwkavcX9Og==", "dev": true, "requires": { +<<<<<<< HEAD "buffer": "^3.0.1", "through": "^2.3.6" +======= + "buffer": "3.6.0", + "through": "2.3.8" + }, + "dependencies": { + "buffer": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz", + "integrity": "sha1-pyyTb3e5a/UvX357RnGAYoVR3vs=", + "dev": true, + "requires": { + "base64-js": "0.0.8", + "ieee754": "1.1.11", + "isarray": "1.0.0" + } + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "union-value": { @@ -13024,10 +18826,17 @@ "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", "dev": true, "requires": { +<<<<<<< HEAD "arr-union": "^3.1.0", "get-value": "^2.0.6", "is-extendable": "^0.1.1", "set-value": "^0.4.3" +======= + "arr-union": "3.1.0", + "get-value": "2.0.6", + "is-extendable": "0.1.1", + "set-value": "0.4.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "extend-shallow": { @@ -13036,7 +18845,11 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { +<<<<<<< HEAD "is-extendable": "^0.1.0" +======= + "is-extendable": "0.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "set-value": { @@ -13045,10 +18858,17 @@ "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", "dev": true, "requires": { +<<<<<<< HEAD "extend-shallow": "^2.0.1", "is-extendable": "^0.1.1", "is-plain-object": "^2.0.1", "to-object-path": "^0.3.0" +======= + "extend-shallow": "2.0.1", + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "to-object-path": "0.3.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -13059,6 +18879,7 @@ "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=", "dev": true }, +<<<<<<< HEAD "uniqid": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-4.1.1.tgz", @@ -13068,6 +18889,8 @@ "macaddress": "^0.2.8" } }, +======= +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "uniqs": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz", @@ -13080,7 +18903,11 @@ "integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=", "dev": true, "requires": { +<<<<<<< HEAD "unique-slug": "^2.0.0" +======= + "unique-slug": "2.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "unique-slug": { @@ -13089,7 +18916,11 @@ "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=", "dev": true, "requires": { +<<<<<<< HEAD "imurmurhash": "^0.1.4" +======= + "imurmurhash": "0.1.4" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "unique-stream": { @@ -13098,8 +18929,24 @@ "integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=", "dev": true, "requires": { +<<<<<<< HEAD "json-stable-stringify": "^1.0.0", "through2-filter": "^2.0.0" +======= + "json-stable-stringify": "1.0.1", + "through2-filter": "2.0.0" + }, + "dependencies": { + "json-stable-stringify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", + "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", + "dev": true, + "requires": { + "jsonify": "0.0.0" + } + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "universalify": { @@ -13126,8 +18973,13 @@ "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", "dev": true, "requires": { +<<<<<<< HEAD "has-value": "^0.3.1", "isobject": "^3.0.0" +======= + "has-value": "0.3.1", + "isobject": "3.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "has-value": { @@ -13136,9 +18988,15 @@ "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", "dev": true, "requires": { +<<<<<<< HEAD "get-value": "^2.0.3", "has-values": "^0.1.4", "isobject": "^2.0.0" +======= + "get-value": "2.0.6", + "has-values": "0.1.4", + "isobject": "2.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "isobject": { @@ -13157,6 +19015,21 @@ "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", "dev": true +<<<<<<< HEAD +======= + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } }, @@ -13179,6 +19052,7 @@ "dev": true }, "uri-js": { +<<<<<<< HEAD "version": "4.2.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.1.tgz", "integrity": "sha512-jpKCA3HjsBfSDOEgxRDAxQCNyHfCPSbq57PqCkd3gAyBuPb3IWxw54EHncqESznIdqSetHfw3D7ylThu2Kcc9A==", @@ -13191,6 +19065,20 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz", "integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0=", +======= + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", + "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", + "dev": true, + "requires": { + "punycode": "2.1.1" + }, + "dependencies": { + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "dev": true } } @@ -13220,6 +19108,7 @@ } }, "url-parse": { +<<<<<<< HEAD "version": "1.4.0", "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.0.tgz", "integrity": "sha512-ERuGxDiQ6Xw/agN4tuoCRbmwRuZP0cJ1lJxJubXr5Q/5cDa78+Dc4wfvtxzhzhkm5VvmW6Mf8EVj9SPGN4l8Lg==", @@ -13227,6 +19116,15 @@ "requires": { "querystringify": "^2.0.0", "requires-port": "^1.0.0" +======= + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.1.tgz", + "integrity": "sha512-x95Td74QcvICAA0+qERaVkRpTGKyBHHYdwL2LXZm5t/gBtCB9KQSO/0zQgSTYEV1p0WcvSg79TLNPSvd5IDJMQ==", + "dev": true, + "requires": { + "querystringify": "2.0.0", + "requires-port": "1.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "url-parse-lax": { @@ -13235,7 +19133,11 @@ "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", "dev": true, "requires": { +<<<<<<< HEAD "prepend-http": "^1.0.1" +======= + "prepend-http": "1.0.4" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "url-regex": { @@ -13244,7 +19146,11 @@ "integrity": "sha1-260eDJ4p4QXdCx8J9oYvf9tIJyQ=", "dev": true, "requires": { +<<<<<<< HEAD "ip-regex": "^1.0.1" +======= + "ip-regex": "1.0.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "url-to-options": { @@ -13259,7 +19165,19 @@ "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==", "dev": true, "requires": { +<<<<<<< HEAD "kind-of": "^6.0.2" +======= + "kind-of": "6.0.2" + }, + "dependencies": { + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "dev": true + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "util": { @@ -13291,8 +19209,13 @@ "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==", "dev": true, "requires": { +<<<<<<< HEAD "define-properties": "^1.1.2", "object.getownpropertydescriptors": "^2.0.3" +======= + "define-properties": "1.1.2", + "object.getownpropertydescriptors": "2.0.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "utils-merge": { @@ -13302,9 +19225,15 @@ "dev": true }, "uuid": { +<<<<<<< HEAD "version": "3.2.1", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==", +======= + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", + "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "dev": true }, "vali-date": { @@ -13319,8 +19248,13 @@ "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==", "dev": true, "requires": { +<<<<<<< HEAD "spdx-correct": "^3.0.0", "spdx-expression-parse": "^3.0.0" +======= + "spdx-correct": "3.0.0", + "spdx-expression-parse": "3.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "vary": { @@ -13341,9 +19275,15 @@ "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "dev": true, "requires": { +<<<<<<< HEAD "assert-plus": "^1.0.0", "core-util-is": "1.0.2", "extsprintf": "^1.2.0" +======= + "assert-plus": "1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "1.3.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "assert-plus": { @@ -13360,8 +19300,13 @@ "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", "dev": true, "requires": { +<<<<<<< HEAD "clone": "^1.0.0", "clone-stats": "^0.0.1", +======= + "clone": "1.0.4", + "clone-stats": "0.0.1", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "replace-ext": "0.0.1" }, "dependencies": { @@ -13379,8 +19324,13 @@ "integrity": "sha1-TRmIkbVRWRHXcajNnFSApGoHSkU=", "dev": true, "requires": { +<<<<<<< HEAD "object-assign": "^4.0.1", "readable-stream": "^2.0.0" +======= + "object-assign": "4.1.1", + "readable-stream": "2.3.6" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "vinyl-fs": { @@ -13389,6 +19339,7 @@ "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=", "dev": true, "requires": { +<<<<<<< HEAD "duplexify": "^3.2.0", "glob-stream": "^5.3.2", "graceful-fs": "^4.0.0", @@ -13418,6 +19369,25 @@ "xtend": "~4.0.1" } } +======= + "duplexify": "3.6.0", + "glob-stream": "5.3.5", + "graceful-fs": "4.1.11", + "gulp-sourcemaps": "1.6.0", + "is-valid-glob": "0.3.0", + "lazystream": "1.0.0", + "lodash.isequal": "4.5.0", + "merge-stream": "1.0.1", + "mkdirp": "0.5.1", + "object-assign": "4.1.1", + "readable-stream": "2.3.6", + "strip-bom": "2.0.0", + "strip-bom-stream": "1.0.0", + "through2": "2.0.3", + "through2-filter": "2.0.0", + "vali-date": "1.0.0", + "vinyl": "1.2.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "vm-browserify": { @@ -13442,6 +19412,7 @@ "dev": true }, "vue-loader": { +<<<<<<< HEAD "version": "13.7.1", "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-13.7.1.tgz", "integrity": "sha512-v6PbKMGl/hWHGPxB2uGHsA66vusrXF66J/h1QiFXtU6z5zVSK8jq5xl95M1p3QNXmuEJKNP3nxoXfbgQNs7hJg==", @@ -13460,6 +19431,34 @@ "vue-hot-reload-api": "^2.2.0", "vue-style-loader": "^3.0.0", "vue-template-es2015-compiler": "^1.6.0" +======= + "version": "13.7.2", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-13.7.2.tgz", + "integrity": "sha512-pgFWFsUjYO1v+J+3r7K0Q4lCp0eOyI24/q9j+cCudWyCTjgpjpcAa1MdwjlDUUettt9xkkUBbQ9fkAN1NC8t9w==", + "dev": true, + "requires": { + "consolidate": "0.14.5", + "hash-sum": "1.0.2", + "loader-utils": "1.1.0", + "lru-cache": "4.1.3", + "postcss": "6.0.22", + "postcss-load-config": "1.2.0", + "postcss-selector-parser": "2.2.3", + "prettier": "1.13.4", + "resolve": "1.7.1", + "source-map": "0.6.1", + "vue-hot-reload-api": "2.3.0", + "vue-style-loader": "3.1.2", + "vue-template-es2015-compiler": "1.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "vue-style-loader": { @@ -13468,8 +19467,13 @@ "integrity": "sha512-ICtVdK/p+qXWpdSs2alWtsXt9YnDoYjQe0w5616j9+/EhjoxZkbun34uWgsMFnC1MhrMMwaWiImz3K2jK1Yp2Q==", "dev": true, "requires": { +<<<<<<< HEAD "hash-sum": "^1.0.2", "loader-utils": "^1.0.2" +======= + "hash-sum": "1.0.2", + "loader-utils": "1.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "vue-template-compiler": { @@ -13478,8 +19482,13 @@ "integrity": "sha512-ZbuhCcF/hTYmldoUOVcu2fcbeSAZnfzwDskGduOrnjBiIWHgELAd+R8nAtX80aZkceWDKGQ6N9/0/EUpt+l22A==", "dev": true, "requires": { +<<<<<<< HEAD "de-indent": "^1.0.2", "he": "^1.1.0" +======= + "de-indent": "1.0.2", + "he": "1.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "vue-template-es2015-compiler": { @@ -13494,7 +19503,11 @@ "integrity": "sha1-0bFPOdLiy0q4xAmPdW/ksWTkc9Q=", "dev": true, "requires": { +<<<<<<< HEAD "wrap-fn": "^0.1.0" +======= + "wrap-fn": "0.1.5" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "watchpack": { @@ -13503,9 +19516,357 @@ "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==", "dev": true, "requires": { +<<<<<<< HEAD "chokidar": "^2.0.2", "graceful-fs": "^4.1.2", "neo-async": "^2.5.0" +======= + "chokidar": "2.0.3", + "graceful-fs": "4.1.11", + "neo-async": "2.5.1" + }, + "dependencies": { + "anymatch": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", + "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", + "dev": true, + "requires": { + "micromatch": "3.1.10", + "normalize-path": "2.1.1" + } + }, + "arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "dev": true + }, + "array-unique": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", + "dev": true + }, + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, + "requires": { + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.2", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "chokidar": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz", + "integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==", + "dev": true, + "requires": { + "anymatch": "2.0.0", + "async-each": "1.0.1", + "braces": "2.3.2", + "fsevents": "1.2.4", + "glob-parent": "3.1.0", + "inherits": "2.0.3", + "is-binary-path": "1.0.1", + "is-glob": "4.0.0", + "normalize-path": "2.1.1", + "path-is-absolute": "1.0.1", + "readdirp": "2.1.0", + "upath": "1.1.0" + } + }, + "expand-brackets": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "dev": true, + "requires": { + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "posix-character-classes": "0.1.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, + "requires": { + "is-descriptor": "0.1.6" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + }, + "is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" + } + }, + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true + } + } + }, + "extglob": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", + "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", + "dev": true, + "requires": { + "array-unique": "0.3.2", + "define-property": "1.0.0", + "expand-brackets": "2.1.4", + "extend-shallow": "2.0.1", + "fragment-cache": "0.2.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, + "requires": { + "is-descriptor": "1.0.2" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "dev": true, + "requires": { + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "dev": true, + "requires": { + "is-glob": "3.1.0", + "path-dirname": "1.0.2" + }, + "dependencies": { + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "dev": true, + "requires": { + "is-extglob": "2.1.1" + } + } + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dev": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dev": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true + }, + "is-glob": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", + "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", + "dev": true, + "requires": { + "is-extglob": "2.1.1" + } + }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "dev": true + }, + "micromatch": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "dev": true, + "requires": { + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.2", + "nanomatch": "1.2.9", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + } + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "wbuf": { @@ -13514,7 +19875,11 @@ "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", "dev": true, "requires": { +<<<<<<< HEAD "minimalistic-assert": "^1.0.0" +======= + "minimalistic-assert": "1.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "webpack": { @@ -13523,6 +19888,7 @@ "integrity": "sha512-Sw7MdIIOv/nkzPzee4o0EdvCuPmxT98+vVpIvwtcwcF1Q4SDSNp92vwcKc4REe7NItH9f1S4ra9FuQ7yuYZ8bQ==", "dev": true, "requires": { +<<<<<<< HEAD "acorn": "^5.0.0", "acorn-dynamic-import": "^2.0.0", "ajv": "^6.1.0", @@ -13545,6 +19911,30 @@ "watchpack": "^1.4.0", "webpack-sources": "^1.0.1", "yargs": "^8.0.2" +======= + "acorn": "5.6.0", + "acorn-dynamic-import": "2.0.2", + "ajv": "6.5.0", + "ajv-keywords": "3.2.0", + "async": "2.6.1", + "enhanced-resolve": "3.4.1", + "escope": "3.6.0", + "interpret": "1.1.0", + "json-loader": "0.5.7", + "json5": "0.5.1", + "loader-runner": "2.3.0", + "loader-utils": "1.1.0", + "memory-fs": "0.4.1", + "mkdirp": "0.5.1", + "node-libs-browser": "2.1.0", + "source-map": "0.5.7", + "supports-color": "4.5.0", + "tapable": "0.2.8", + "uglifyjs-webpack-plugin": "0.4.6", + "watchpack": "1.6.0", + "webpack-sources": "1.1.0", + "yargs": "8.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "ajv": { @@ -13553,10 +19943,26 @@ "integrity": "sha512-VDUX1oSajablmiyFyED9L1DFndg0P9h7p1F+NO8FkIzei6EPrR6Zu1n18rd5P8PqaSRd/FrWv3G1TVBqpM83gA==", "dev": true, "requires": { +<<<<<<< HEAD "fast-deep-equal": "^2.0.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.3.0", "uri-js": "^4.2.1" +======= + "fast-deep-equal": "2.0.1", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1", + "uri-js": "4.2.2" + } + }, + "async": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", + "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", + "dev": true, + "requires": { + "lodash": "4.17.10" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "fast-deep-equal": { @@ -13571,19 +19977,26 @@ "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", "dev": true }, +<<<<<<< HEAD "source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, +======= +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "supports-color": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", "dev": true, "requires": { +<<<<<<< HEAD "has-flag": "^2.0.0" +======= + "has-flag": "2.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "uglifyjs-webpack-plugin": { @@ -13592,9 +20005,15 @@ "integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=", "dev": true, "requires": { +<<<<<<< HEAD "source-map": "^0.5.6", "uglify-js": "^2.8.29", "webpack-sources": "^1.0.1" +======= + "source-map": "0.5.7", + "uglify-js": "2.8.29", + "webpack-sources": "1.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -13611,11 +20030,19 @@ "integrity": "sha512-FCrqPy1yy/sN6U/SaEZcHKRXGlqU0DUaEBL45jkUYoB8foVb6wCnbIJ1HKIx+qUFTW+3JpVcCJCxZ8VATL4e+A==", "dev": true, "requires": { +<<<<<<< HEAD "memory-fs": "~0.4.1", "mime": "^1.5.0", "path-is-absolute": "^1.0.0", "range-parser": "^1.0.3", "time-stamp": "^2.0.0" +======= + "memory-fs": "0.4.1", + "mime": "1.6.0", + "path-is-absolute": "1.0.1", + "range-parser": "1.2.0", + "time-stamp": "2.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "mime": { @@ -13639,6 +20066,7 @@ "dev": true, "requires": { "ansi-html": "0.0.7", +<<<<<<< HEAD "array-includes": "^3.0.3", "bonjour": "^3.5.0", "chokidar": "^2.0.0", @@ -13663,16 +20091,97 @@ "spdy": "^3.4.1", "strip-ansi": "^3.0.0", "supports-color": "^5.1.0", +======= + "array-includes": "3.0.3", + "bonjour": "3.5.0", + "chokidar": "2.0.3", + "compression": "1.7.2", + "connect-history-api-fallback": "1.5.0", + "debug": "3.1.0", + "del": "3.0.0", + "express": "4.16.3", + "html-entities": "1.2.1", + "http-proxy-middleware": "0.17.4", + "import-local": "1.0.0", + "internal-ip": "1.2.0", + "ip": "1.1.5", + "killable": "1.0.0", + "loglevel": "1.6.1", + "opn": "5.3.0", + "portfinder": "1.0.13", + "selfsigned": "1.10.3", + "serve-index": "1.9.1", + "sockjs": "0.3.19", + "sockjs-client": "1.1.4", + "spdy": "3.4.7", + "strip-ansi": "3.0.1", + "supports-color": "5.4.0", +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "webpack-dev-middleware": "1.12.2", "yargs": "6.6.0" }, "dependencies": { +<<<<<<< HEAD +======= + "anymatch": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", + "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", + "dev": true, + "requires": { + "micromatch": "3.1.10", + "normalize-path": "2.1.1" + } + }, + "arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "dev": true + }, + "array-unique": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", + "dev": true + }, + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, + "requires": { + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.2", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 "camelcase": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", "dev": true }, +<<<<<<< HEAD "is-fullwidth-code-point": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", @@ -13680,6 +20189,313 @@ "dev": true, "requires": { "number-is-nan": "^1.0.0" +======= + "chokidar": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz", + "integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==", + "dev": true, + "requires": { + "anymatch": "2.0.0", + "async-each": "1.0.1", + "braces": "2.3.2", + "fsevents": "1.2.4", + "glob-parent": "3.1.0", + "inherits": "2.0.3", + "is-binary-path": "1.0.1", + "is-glob": "4.0.0", + "normalize-path": "2.1.1", + "path-is-absolute": "1.0.1", + "readdirp": "2.1.0", + "upath": "1.1.0" + } + }, + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "expand-brackets": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "dev": true, + "requires": { + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "posix-character-classes": "0.1.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, + "requires": { + "is-descriptor": "0.1.6" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + }, + "is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" + } + }, + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true + } + } + }, + "extglob": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", + "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", + "dev": true, + "requires": { + "array-unique": "0.3.2", + "define-property": "1.0.0", + "expand-brackets": "2.1.4", + "extend-shallow": "2.0.1", + "fragment-cache": "0.2.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, + "requires": { + "is-descriptor": "1.0.2" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "dev": true, + "requires": { + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "dev": true, + "requires": { + "is-glob": "3.1.0", + "path-dirname": "1.0.2" + }, + "dependencies": { + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "dev": true, + "requires": { + "is-extglob": "2.1.1" + } + } + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dev": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dev": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true + }, + "is-glob": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", + "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", + "dev": true, + "requires": { + "is-extglob": "2.1.1" + } + }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "dev": true + }, + "micromatch": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "dev": true, + "requires": { + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.2", + "nanomatch": "1.2.9", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "string-width": { @@ -13688,9 +20504,24 @@ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { +<<<<<<< HEAD "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", "strip-ansi": "^3.0.0" +======= + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + }, + "supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "dev": true, + "requires": { + "has-flag": "3.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "yargs": { @@ -13699,6 +20530,7 @@ "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=", "dev": true, "requires": { +<<<<<<< HEAD "camelcase": "^3.0.0", "cliui": "^3.2.0", "decamelize": "^1.1.1", @@ -13712,6 +20544,21 @@ "which-module": "^1.0.0", "y18n": "^3.2.1", "yargs-parser": "^4.2.0" +======= + "camelcase": "3.0.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "y18n": "3.2.1", + "yargs-parser": "4.2.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "yargs-parser": { @@ -13720,7 +20567,11 @@ "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=", "dev": true, "requires": { +<<<<<<< HEAD "camelcase": "^3.0.0" +======= + "camelcase": "3.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -13731,7 +20582,11 @@ "integrity": "sha512-/0QYwW/H1N/CdXYA2PNPVbsxO3u2Fpz34vs72xm03SRfg6bMNGfMJIQEpQjKRvkG2JvT6oRJFpDtSrwbX8Jzvw==", "dev": true, "requires": { +<<<<<<< HEAD "lodash": "^4.17.5" +======= + "lodash": "4.17.10" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "webpack-notifier": { @@ -13740,9 +20595,15 @@ "integrity": "sha1-/6yOVf+MRpdSuMG7sBGhbxCYbgI=", "dev": true, "requires": { +<<<<<<< HEAD "node-notifier": "^5.1.2", "object-assign": "^4.1.0", "strip-ansi": "^3.0.1" +======= + "node-notifier": "5.2.1", + "object-assign": "4.1.1", + "strip-ansi": "3.0.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "webpack-sources": { @@ -13751,8 +20612,21 @@ "integrity": "sha512-aqYp18kPphgoO5c/+NaUvEeACtZjMESmDChuD3NBciVpah3XpMEU9VAAtIaB1BsfJWWTSdv8Vv1m3T0aRk2dUw==", "dev": true, "requires": { +<<<<<<< HEAD "source-list-map": "^2.0.0", "source-map": "~0.6.1" +======= + "source-list-map": "2.0.0", + "source-map": "0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "websocket-driver": { @@ -13761,8 +20635,13 @@ "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=", "dev": true, "requires": { +<<<<<<< HEAD "http-parser-js": ">=0.4.0", "websocket-extensions": ">=0.1.1" +======= + "http-parser-js": "0.4.13", + "websocket-extensions": "0.1.3" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "websocket-extensions": { @@ -13778,12 +20657,21 @@ "dev": true }, "which": { +<<<<<<< HEAD "version": "1.3.0", "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", "dev": true, "requires": { "isexe": "^2.0.0" +======= + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "requires": { + "isexe": "2.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "which-module": { @@ -13793,6 +20681,7 @@ "dev": true }, "wide-align": { +<<<<<<< HEAD "version": "1.1.2", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", @@ -13821,6 +20710,14 @@ "strip-ansi": "^3.0.0" } } +======= + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "dev": true, + "requires": { + "string-width": "2.1.1" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "window-size": { @@ -13841,6 +20738,7 @@ "integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==", "dev": true, "requires": { +<<<<<<< HEAD "errno": "~0.1.7" } }, @@ -13874,6 +20772,9 @@ "strip-ansi": "^3.0.0" } } +======= + "errno": "0.1.7" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "wrap-fn": { @@ -13923,6 +20824,7 @@ "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=", "dev": true, "requires": { +<<<<<<< HEAD "camelcase": "^4.1.0", "cliui": "^3.2.0", "decamelize": "^1.1.1", @@ -13936,6 +20838,21 @@ "which-module": "^2.0.0", "y18n": "^3.2.1", "yargs-parser": "^7.0.0" +======= + "camelcase": "4.1.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "os-locale": "2.1.0", + "read-pkg-up": "2.0.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "7.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "camelcase": { @@ -13950,10 +20867,17 @@ "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "dev": true, "requires": { +<<<<<<< HEAD "graceful-fs": "^4.1.2", "parse-json": "^2.2.0", "pify": "^2.0.0", "strip-bom": "^3.0.0" +======= + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "strip-bom": "3.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "os-locale": { @@ -13962,9 +20886,15 @@ "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", "dev": true, "requires": { +<<<<<<< HEAD "execa": "^0.7.0", "lcid": "^1.0.0", "mem": "^1.1.0" +======= + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "path-type": { @@ -13973,7 +20903,11 @@ "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", "dev": true, "requires": { +<<<<<<< HEAD "pify": "^2.0.0" +======= + "pify": "2.3.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "pify": { @@ -13988,9 +20922,15 @@ "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", "dev": true, "requires": { +<<<<<<< HEAD "load-json-file": "^2.0.0", "normalize-package-data": "^2.3.2", "path-type": "^2.0.0" +======= + "load-json-file": "2.0.0", + "normalize-package-data": "2.4.0", + "path-type": "2.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "read-pkg-up": { @@ -13999,8 +20939,13 @@ "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", "dev": true, "requires": { +<<<<<<< HEAD "find-up": "^2.0.0", "read-pkg": "^2.0.0" +======= + "find-up": "2.1.0", + "read-pkg": "2.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } }, "strip-bom": { @@ -14021,7 +20966,11 @@ "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=", "dev": true, "requires": { +<<<<<<< HEAD "camelcase": "^4.1.0" +======= + "camelcase": "4.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } @@ -14032,7 +20981,11 @@ "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", "dev": true, "requires": { +<<<<<<< HEAD "camelcase": "^3.0.0" +======= + "camelcase": "3.0.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 }, "dependencies": { "camelcase": { @@ -14044,6 +20997,7 @@ } }, "yauzl": { +<<<<<<< HEAD "version": "2.9.1", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.9.1.tgz", "integrity": "sha1-qBmB6nCleUYTOIPwKcWCGok1mn8=", @@ -14051,6 +21005,15 @@ "requires": { "buffer-crc32": "~0.2.3", "fd-slicer": "~1.0.1" +======= + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.9.2.tgz", + "integrity": "sha1-T7G8euH8L1cDe1SvasyP4QMcW3c=", + "dev": true, + "requires": { + "buffer-crc32": "0.2.13", + "fd-slicer": "1.1.0" +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 } } } diff --git a/phpunit.xml b/phpunit.xml index bb33592..ab39816 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -28,6 +28,9 @@ +<<<<<<< HEAD +======= +>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106 diff --git a/public/company-profile.html b/public/company-profile.html index 6c3a2e5..6bb6eaf 100644 --- a/public/company-profile.html +++ b/public/company-profile.html @@ -3,6 +3,7 @@ AzureUI - Term + @@ -10,6 +11,7 @@ .header { width:relative; margin: 0 auto; + height: 30px; } #backbtn { @@ -41,6 +43,7 @@
+ + +
+
+ Please upload the registration certificate.
-
-
- Company Information -
-
+
-
+
+ + + +
+ +
+ Company Information +
+ +
+ + +
@@ -102,20 +124,82 @@
-
- -
- Edit -
+ Submit +
+ + + + + + \ No newline at end of file diff --git a/public/css/app.css b/public/css/app.css deleted file mode 100644 index 8b4dc7e..0000000 --- a/public/css/app.css +++ /dev/null @@ -1,6 +0,0 @@ -@import url(https://fonts.googleapis.com/css?family=Raleway:300,400,600);/*! - * Bootstrap v4.0.0 (https://getbootstrap.com) - * Copyright 2011-2018 The Bootstrap Authors - * Copyright 2011-2018 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - */:root{--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--white:#fff;--gray:#6c757d;--gray-dark:#343a40;--primary:#007bff;--secondary:#6c757d;--success:#28a745;--info:#17a2b8;--warning:#ffc107;--danger:#dc3545;--light:#f8f9fa;--dark:#343a40;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:"Raleway",sans-serif;--font-family-monospace:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace}*,:after,:before{-webkit-box-sizing:border-box;box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-ms-overflow-style:scrollbar;-webkit-tap-highlight-color:transparent}@-ms-viewport{width:device-width}article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:Raleway,sans-serif;font-size:.9rem;font-weight:400;line-height:1.6;color:#212529;text-align:left;background-color:#f5f8fa}[tabindex="-1"]:focus{outline:0!important}hr{-webkit-box-sizing:content-box;box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;border-bottom:0}address{font-style:normal;line-height:inherit}address,dl,ol,ul{margin-bottom:1rem}dl,ol,ul{margin-top:0}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}dfn{font-style:italic}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#007bff;text-decoration:none;background-color:transparent;-webkit-text-decoration-skip:objects}a:hover{color:#0056b3;text-decoration:underline}a:not([href]):not([tabindex]),a:not([href]):not([tabindex]):focus,a:not([href]):not([tabindex]):hover{color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus{outline:0}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto;-ms-overflow-style:scrollbar}figure{margin:0 0 1rem}img{vertical-align:middle;border-style:none}svg:not(:root){overflow:hidden}table{border-collapse:collapse}caption{padding-top:.75rem;padding-bottom:.75rem;color:#6c757d;text-align:left;caption-side:bottom}th{text-align:inherit}label{display:inline-block;margin-bottom:.5rem}button{border-radius:0}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=date],input[type=datetime-local],input[type=month],input[type=time]{-webkit-appearance:listbox}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item;cursor:pointer}template{display:none}[hidden]{display:none!important}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{margin-bottom:.5rem;font-family:inherit;font-weight:500;line-height:1.2;color:inherit}.h1,h1{font-size:2.25rem}.h2,h2{font-size:1.8rem}.h3,h3{font-size:1.575rem}.h4,h4{font-size:1.35rem}.h5,h5{font-size:1.125rem}.h6,h6{font-size:.9rem}.lead{font-size:1.125rem;font-weight:300}.display-1{font-size:6rem}.display-1,.display-2{font-weight:300;line-height:1.2}.display-2{font-size:5.5rem}.display-3{font-size:4.5rem}.display-3,.display-4{font-weight:300;line-height:1.2}.display-4{font-size:3.5rem}hr{margin-top:1rem;margin-bottom:1rem;border:0;border-top:1px solid rgba(0,0,0,.1)}.small,small{font-size:80%;font-weight:400}.mark,mark{padding:.2em;background-color:#fcf8e3}.list-inline,.list-unstyled{padding-left:0;list-style:none}.list-inline-item{display:inline-block}.list-inline-item:not(:last-child){margin-right:.5rem}.initialism{font-size:90%;text-transform:uppercase}.blockquote{margin-bottom:1rem;font-size:1.125rem}.blockquote-footer{display:block;font-size:80%;color:#6c757d}.blockquote-footer:before{content:"\2014 \A0"}.img-fluid,.img-thumbnail{max-width:100%;height:auto}.img-thumbnail{padding:.25rem;background-color:#f5f8fa;border:1px solid #dee2e6;border-radius:.25rem}.figure{display:inline-block}.figure-img{margin-bottom:.5rem;line-height:1}.figure-caption{font-size:90%;color:#6c757d}code,kbd,pre,samp{font-family:SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace}code{font-size:87.5%;color:#e83e8c;word-break:break-word}a>code{color:inherit}kbd{padding:.2rem .4rem;font-size:87.5%;color:#fff;background-color:#212529;border-radius:.2rem}kbd kbd{padding:0;font-size:100%;font-weight:700}pre{display:block;font-size:87.5%;color:#212529}pre code{font-size:inherit;color:inherit;word-break:normal}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{width:100%;padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:576px){.container{max-width:540px}}@media (min-width:768px){.container{max-width:720px}}@media (min-width:992px){.container{max-width:960px}}@media (min-width:1200px){.container{max-width:1140px}}.container-fluid{width:100%;padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-right:-15px;margin-left:-15px}.no-gutters{margin-right:0;margin-left:0}.no-gutters>.col,.no-gutters>[class*=col-]{padding-right:0;padding-left:0}.col,.col-1,.col-2,.col-3,.col-4,.col-5,.col-6,.col-7,.col-8,.col-9,.col-10,.col-11,.col-12,.col-auto,.col-lg,.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-auto,.col-md,.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11,.col-md-12,.col-md-auto,.col-sm,.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-auto,.col-xl,.col-xl-1,.col-xl-2,.col-xl-3,.col-xl-4,.col-xl-5,.col-xl-6,.col-xl-7,.col-xl-8,.col-xl-9,.col-xl-10,.col-xl-11,.col-xl-12,.col-xl-auto{position:relative;width:100%;min-height:1px;padding-right:15px;padding-left:15px}.col{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-auto{-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-1,.col-auto{-webkit-box-flex:0}.col-1{-ms-flex:0 0 8.33333333%;flex:0 0 8.33333333%;max-width:8.33333333%}.col-2{-ms-flex:0 0 16.66666667%;flex:0 0 16.66666667%;max-width:16.66666667%}.col-2,.col-3{-webkit-box-flex:0}.col-3{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-4{-ms-flex:0 0 33.33333333%;flex:0 0 33.33333333%;max-width:33.33333333%}.col-4,.col-5{-webkit-box-flex:0}.col-5{-ms-flex:0 0 41.66666667%;flex:0 0 41.66666667%;max-width:41.66666667%}.col-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-6,.col-7{-webkit-box-flex:0}.col-7{-ms-flex:0 0 58.33333333%;flex:0 0 58.33333333%;max-width:58.33333333%}.col-8{-ms-flex:0 0 66.66666667%;flex:0 0 66.66666667%;max-width:66.66666667%}.col-8,.col-9{-webkit-box-flex:0}.col-9{-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-10{-ms-flex:0 0 83.33333333%;flex:0 0 83.33333333%;max-width:83.33333333%}.col-10,.col-11{-webkit-box-flex:0}.col-11{-ms-flex:0 0 91.66666667%;flex:0 0 91.66666667%;max-width:91.66666667%}.col-12{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-first{-webkit-box-ordinal-group:0;-ms-flex-order:-1;order:-1}.order-last{-webkit-box-ordinal-group:14;-ms-flex-order:13;order:13}.order-0{-webkit-box-ordinal-group:1;-ms-flex-order:0;order:0}.order-1{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}.order-2{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.order-3{-webkit-box-ordinal-group:4;-ms-flex-order:3;order:3}.order-4{-webkit-box-ordinal-group:5;-ms-flex-order:4;order:4}.order-5{-webkit-box-ordinal-group:6;-ms-flex-order:5;order:5}.order-6{-webkit-box-ordinal-group:7;-ms-flex-order:6;order:6}.order-7{-webkit-box-ordinal-group:8;-ms-flex-order:7;order:7}.order-8{-webkit-box-ordinal-group:9;-ms-flex-order:8;order:8}.order-9{-webkit-box-ordinal-group:10;-ms-flex-order:9;order:9}.order-10{-webkit-box-ordinal-group:11;-ms-flex-order:10;order:10}.order-11{-webkit-box-ordinal-group:12;-ms-flex-order:11;order:11}.order-12{-webkit-box-ordinal-group:13;-ms-flex-order:12;order:12}.offset-1{margin-left:8.33333333%}.offset-2{margin-left:16.66666667%}.offset-3{margin-left:25%}.offset-4{margin-left:33.33333333%}.offset-5{margin-left:41.66666667%}.offset-6{margin-left:50%}.offset-7{margin-left:58.33333333%}.offset-8{margin-left:66.66666667%}.offset-9{margin-left:75%}.offset-10{margin-left:83.33333333%}.offset-11{margin-left:91.66666667%}@media (min-width:576px){.col-sm{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-sm-auto{-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-sm-1{-webkit-box-flex:0;-ms-flex:0 0 8.33333333%;flex:0 0 8.33333333%;max-width:8.33333333%}.col-sm-2{-webkit-box-flex:0;-ms-flex:0 0 16.66666667%;flex:0 0 16.66666667%;max-width:16.66666667%}.col-sm-3{-webkit-box-flex:0;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-sm-4{-webkit-box-flex:0;-ms-flex:0 0 33.33333333%;flex:0 0 33.33333333%;max-width:33.33333333%}.col-sm-5{-webkit-box-flex:0;-ms-flex:0 0 41.66666667%;flex:0 0 41.66666667%;max-width:41.66666667%}.col-sm-6{-webkit-box-flex:0;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-sm-7{-webkit-box-flex:0;-ms-flex:0 0 58.33333333%;flex:0 0 58.33333333%;max-width:58.33333333%}.col-sm-8{-webkit-box-flex:0;-ms-flex:0 0 66.66666667%;flex:0 0 66.66666667%;max-width:66.66666667%}.col-sm-9{-webkit-box-flex:0;-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-sm-10{-webkit-box-flex:0;-ms-flex:0 0 83.33333333%;flex:0 0 83.33333333%;max-width:83.33333333%}.col-sm-11{-webkit-box-flex:0;-ms-flex:0 0 91.66666667%;flex:0 0 91.66666667%;max-width:91.66666667%}.col-sm-12{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-sm-first{-webkit-box-ordinal-group:0;-ms-flex-order:-1;order:-1}.order-sm-last{-webkit-box-ordinal-group:14;-ms-flex-order:13;order:13}.order-sm-0{-webkit-box-ordinal-group:1;-ms-flex-order:0;order:0}.order-sm-1{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}.order-sm-2{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.order-sm-3{-webkit-box-ordinal-group:4;-ms-flex-order:3;order:3}.order-sm-4{-webkit-box-ordinal-group:5;-ms-flex-order:4;order:4}.order-sm-5{-webkit-box-ordinal-group:6;-ms-flex-order:5;order:5}.order-sm-6{-webkit-box-ordinal-group:7;-ms-flex-order:6;order:6}.order-sm-7{-webkit-box-ordinal-group:8;-ms-flex-order:7;order:7}.order-sm-8{-webkit-box-ordinal-group:9;-ms-flex-order:8;order:8}.order-sm-9{-webkit-box-ordinal-group:10;-ms-flex-order:9;order:9}.order-sm-10{-webkit-box-ordinal-group:11;-ms-flex-order:10;order:10}.order-sm-11{-webkit-box-ordinal-group:12;-ms-flex-order:11;order:11}.order-sm-12{-webkit-box-ordinal-group:13;-ms-flex-order:12;order:12}.offset-sm-0{margin-left:0}.offset-sm-1{margin-left:8.33333333%}.offset-sm-2{margin-left:16.66666667%}.offset-sm-3{margin-left:25%}.offset-sm-4{margin-left:33.33333333%}.offset-sm-5{margin-left:41.66666667%}.offset-sm-6{margin-left:50%}.offset-sm-7{margin-left:58.33333333%}.offset-sm-8{margin-left:66.66666667%}.offset-sm-9{margin-left:75%}.offset-sm-10{margin-left:83.33333333%}.offset-sm-11{margin-left:91.66666667%}}@media (min-width:768px){.col-md{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-md-auto{-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-md-1{-webkit-box-flex:0;-ms-flex:0 0 8.33333333%;flex:0 0 8.33333333%;max-width:8.33333333%}.col-md-2{-webkit-box-flex:0;-ms-flex:0 0 16.66666667%;flex:0 0 16.66666667%;max-width:16.66666667%}.col-md-3{-webkit-box-flex:0;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-md-4{-webkit-box-flex:0;-ms-flex:0 0 33.33333333%;flex:0 0 33.33333333%;max-width:33.33333333%}.col-md-5{-webkit-box-flex:0;-ms-flex:0 0 41.66666667%;flex:0 0 41.66666667%;max-width:41.66666667%}.col-md-6{-webkit-box-flex:0;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-md-7{-webkit-box-flex:0;-ms-flex:0 0 58.33333333%;flex:0 0 58.33333333%;max-width:58.33333333%}.col-md-8{-webkit-box-flex:0;-ms-flex:0 0 66.66666667%;flex:0 0 66.66666667%;max-width:66.66666667%}.col-md-9{-webkit-box-flex:0;-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-md-10{-webkit-box-flex:0;-ms-flex:0 0 83.33333333%;flex:0 0 83.33333333%;max-width:83.33333333%}.col-md-11{-webkit-box-flex:0;-ms-flex:0 0 91.66666667%;flex:0 0 91.66666667%;max-width:91.66666667%}.col-md-12{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-md-first{-webkit-box-ordinal-group:0;-ms-flex-order:-1;order:-1}.order-md-last{-webkit-box-ordinal-group:14;-ms-flex-order:13;order:13}.order-md-0{-webkit-box-ordinal-group:1;-ms-flex-order:0;order:0}.order-md-1{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}.order-md-2{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.order-md-3{-webkit-box-ordinal-group:4;-ms-flex-order:3;order:3}.order-md-4{-webkit-box-ordinal-group:5;-ms-flex-order:4;order:4}.order-md-5{-webkit-box-ordinal-group:6;-ms-flex-order:5;order:5}.order-md-6{-webkit-box-ordinal-group:7;-ms-flex-order:6;order:6}.order-md-7{-webkit-box-ordinal-group:8;-ms-flex-order:7;order:7}.order-md-8{-webkit-box-ordinal-group:9;-ms-flex-order:8;order:8}.order-md-9{-webkit-box-ordinal-group:10;-ms-flex-order:9;order:9}.order-md-10{-webkit-box-ordinal-group:11;-ms-flex-order:10;order:10}.order-md-11{-webkit-box-ordinal-group:12;-ms-flex-order:11;order:11}.order-md-12{-webkit-box-ordinal-group:13;-ms-flex-order:12;order:12}.offset-md-0{margin-left:0}.offset-md-1{margin-left:8.33333333%}.offset-md-2{margin-left:16.66666667%}.offset-md-3{margin-left:25%}.offset-md-4{margin-left:33.33333333%}.offset-md-5{margin-left:41.66666667%}.offset-md-6{margin-left:50%}.offset-md-7{margin-left:58.33333333%}.offset-md-8{margin-left:66.66666667%}.offset-md-9{margin-left:75%}.offset-md-10{margin-left:83.33333333%}.offset-md-11{margin-left:91.66666667%}}@media (min-width:992px){.col-lg{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-lg-auto{-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-lg-1{-webkit-box-flex:0;-ms-flex:0 0 8.33333333%;flex:0 0 8.33333333%;max-width:8.33333333%}.col-lg-2{-webkit-box-flex:0;-ms-flex:0 0 16.66666667%;flex:0 0 16.66666667%;max-width:16.66666667%}.col-lg-3{-webkit-box-flex:0;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-lg-4{-webkit-box-flex:0;-ms-flex:0 0 33.33333333%;flex:0 0 33.33333333%;max-width:33.33333333%}.col-lg-5{-webkit-box-flex:0;-ms-flex:0 0 41.66666667%;flex:0 0 41.66666667%;max-width:41.66666667%}.col-lg-6{-webkit-box-flex:0;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-lg-7{-webkit-box-flex:0;-ms-flex:0 0 58.33333333%;flex:0 0 58.33333333%;max-width:58.33333333%}.col-lg-8{-webkit-box-flex:0;-ms-flex:0 0 66.66666667%;flex:0 0 66.66666667%;max-width:66.66666667%}.col-lg-9{-webkit-box-flex:0;-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-lg-10{-webkit-box-flex:0;-ms-flex:0 0 83.33333333%;flex:0 0 83.33333333%;max-width:83.33333333%}.col-lg-11{-webkit-box-flex:0;-ms-flex:0 0 91.66666667%;flex:0 0 91.66666667%;max-width:91.66666667%}.col-lg-12{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-lg-first{-webkit-box-ordinal-group:0;-ms-flex-order:-1;order:-1}.order-lg-last{-webkit-box-ordinal-group:14;-ms-flex-order:13;order:13}.order-lg-0{-webkit-box-ordinal-group:1;-ms-flex-order:0;order:0}.order-lg-1{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}.order-lg-2{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.order-lg-3{-webkit-box-ordinal-group:4;-ms-flex-order:3;order:3}.order-lg-4{-webkit-box-ordinal-group:5;-ms-flex-order:4;order:4}.order-lg-5{-webkit-box-ordinal-group:6;-ms-flex-order:5;order:5}.order-lg-6{-webkit-box-ordinal-group:7;-ms-flex-order:6;order:6}.order-lg-7{-webkit-box-ordinal-group:8;-ms-flex-order:7;order:7}.order-lg-8{-webkit-box-ordinal-group:9;-ms-flex-order:8;order:8}.order-lg-9{-webkit-box-ordinal-group:10;-ms-flex-order:9;order:9}.order-lg-10{-webkit-box-ordinal-group:11;-ms-flex-order:10;order:10}.order-lg-11{-webkit-box-ordinal-group:12;-ms-flex-order:11;order:11}.order-lg-12{-webkit-box-ordinal-group:13;-ms-flex-order:12;order:12}.offset-lg-0{margin-left:0}.offset-lg-1{margin-left:8.33333333%}.offset-lg-2{margin-left:16.66666667%}.offset-lg-3{margin-left:25%}.offset-lg-4{margin-left:33.33333333%}.offset-lg-5{margin-left:41.66666667%}.offset-lg-6{margin-left:50%}.offset-lg-7{margin-left:58.33333333%}.offset-lg-8{margin-left:66.66666667%}.offset-lg-9{margin-left:75%}.offset-lg-10{margin-left:83.33333333%}.offset-lg-11{margin-left:91.66666667%}}@media (min-width:1200px){.col-xl{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-xl-auto{-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-xl-1{-webkit-box-flex:0;-ms-flex:0 0 8.33333333%;flex:0 0 8.33333333%;max-width:8.33333333%}.col-xl-2{-webkit-box-flex:0;-ms-flex:0 0 16.66666667%;flex:0 0 16.66666667%;max-width:16.66666667%}.col-xl-3{-webkit-box-flex:0;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-xl-4{-webkit-box-flex:0;-ms-flex:0 0 33.33333333%;flex:0 0 33.33333333%;max-width:33.33333333%}.col-xl-5{-webkit-box-flex:0;-ms-flex:0 0 41.66666667%;flex:0 0 41.66666667%;max-width:41.66666667%}.col-xl-6{-webkit-box-flex:0;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-xl-7{-webkit-box-flex:0;-ms-flex:0 0 58.33333333%;flex:0 0 58.33333333%;max-width:58.33333333%}.col-xl-8{-webkit-box-flex:0;-ms-flex:0 0 66.66666667%;flex:0 0 66.66666667%;max-width:66.66666667%}.col-xl-9{-webkit-box-flex:0;-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-xl-10{-webkit-box-flex:0;-ms-flex:0 0 83.33333333%;flex:0 0 83.33333333%;max-width:83.33333333%}.col-xl-11{-webkit-box-flex:0;-ms-flex:0 0 91.66666667%;flex:0 0 91.66666667%;max-width:91.66666667%}.col-xl-12{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-xl-first{-webkit-box-ordinal-group:0;-ms-flex-order:-1;order:-1}.order-xl-last{-webkit-box-ordinal-group:14;-ms-flex-order:13;order:13}.order-xl-0{-webkit-box-ordinal-group:1;-ms-flex-order:0;order:0}.order-xl-1{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}.order-xl-2{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.order-xl-3{-webkit-box-ordinal-group:4;-ms-flex-order:3;order:3}.order-xl-4{-webkit-box-ordinal-group:5;-ms-flex-order:4;order:4}.order-xl-5{-webkit-box-ordinal-group:6;-ms-flex-order:5;order:5}.order-xl-6{-webkit-box-ordinal-group:7;-ms-flex-order:6;order:6}.order-xl-7{-webkit-box-ordinal-group:8;-ms-flex-order:7;order:7}.order-xl-8{-webkit-box-ordinal-group:9;-ms-flex-order:8;order:8}.order-xl-9{-webkit-box-ordinal-group:10;-ms-flex-order:9;order:9}.order-xl-10{-webkit-box-ordinal-group:11;-ms-flex-order:10;order:10}.order-xl-11{-webkit-box-ordinal-group:12;-ms-flex-order:11;order:11}.order-xl-12{-webkit-box-ordinal-group:13;-ms-flex-order:12;order:12}.offset-xl-0{margin-left:0}.offset-xl-1{margin-left:8.33333333%}.offset-xl-2{margin-left:16.66666667%}.offset-xl-3{margin-left:25%}.offset-xl-4{margin-left:33.33333333%}.offset-xl-5{margin-left:41.66666667%}.offset-xl-6{margin-left:50%}.offset-xl-7{margin-left:58.33333333%}.offset-xl-8{margin-left:66.66666667%}.offset-xl-9{margin-left:75%}.offset-xl-10{margin-left:83.33333333%}.offset-xl-11{margin-left:91.66666667%}}.table{width:100%;max-width:100%;margin-bottom:1rem;background-color:transparent}.table td,.table th{padding:.75rem;vertical-align:top;border-top:1px solid #dee2e6}.table thead th{vertical-align:bottom;border-bottom:2px solid #dee2e6}.table tbody+tbody{border-top:2px solid #dee2e6}.table .table{background-color:#f5f8fa}.table-sm td,.table-sm th{padding:.3rem}.table-bordered,.table-bordered td,.table-bordered th{border:1px solid #dee2e6}.table-bordered thead td,.table-bordered thead th{border-bottom-width:2px}.table-striped tbody tr:nth-of-type(odd){background-color:rgba(0,0,0,.05)}.table-hover tbody tr:hover{background-color:rgba(0,0,0,.075)}.table-primary,.table-primary>td,.table-primary>th{background-color:#b8daff}.table-hover .table-primary:hover,.table-hover .table-primary:hover>td,.table-hover .table-primary:hover>th{background-color:#9fcdff}.table-secondary,.table-secondary>td,.table-secondary>th{background-color:#d6d8db}.table-hover .table-secondary:hover,.table-hover .table-secondary:hover>td,.table-hover .table-secondary:hover>th{background-color:#c8cbcf}.table-success,.table-success>td,.table-success>th{background-color:#c3e6cb}.table-hover .table-success:hover,.table-hover .table-success:hover>td,.table-hover .table-success:hover>th{background-color:#b1dfbb}.table-info,.table-info>td,.table-info>th{background-color:#bee5eb}.table-hover .table-info:hover,.table-hover .table-info:hover>td,.table-hover .table-info:hover>th{background-color:#abdde5}.table-warning,.table-warning>td,.table-warning>th{background-color:#ffeeba}.table-hover .table-warning:hover,.table-hover .table-warning:hover>td,.table-hover .table-warning:hover>th{background-color:#ffe8a1}.table-danger,.table-danger>td,.table-danger>th{background-color:#f5c6cb}.table-hover .table-danger:hover,.table-hover .table-danger:hover>td,.table-hover .table-danger:hover>th{background-color:#f1b0b7}.table-light,.table-light>td,.table-light>th{background-color:#fdfdfe}.table-hover .table-light:hover,.table-hover .table-light:hover>td,.table-hover .table-light:hover>th{background-color:#ececf6}.table-dark,.table-dark>td,.table-dark>th{background-color:#c6c8ca}.table-hover .table-dark:hover,.table-hover .table-dark:hover>td,.table-hover .table-dark:hover>th{background-color:#b9bbbe}.table-active,.table-active>td,.table-active>th,.table-hover .table-active:hover,.table-hover .table-active:hover>td,.table-hover .table-active:hover>th{background-color:rgba(0,0,0,.075)}.table .thead-dark th{color:#f5f8fa;background-color:#212529;border-color:#32383e}.table .thead-light th{color:#495057;background-color:#e9ecef;border-color:#dee2e6}.table-dark{color:#f5f8fa;background-color:#212529}.table-dark td,.table-dark th,.table-dark thead th{border-color:#32383e}.table-dark.table-bordered{border:0}.table-dark.table-striped tbody tr:nth-of-type(odd){background-color:hsla(0,0%,100%,.05)}.table-dark.table-hover tbody tr:hover{background-color:hsla(0,0%,100%,.075)}@media (max-width:575.98px){.table-responsive-sm{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive-sm>.table-bordered{border:0}}@media (max-width:767.98px){.table-responsive-md{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive-md>.table-bordered{border:0}}@media (max-width:991.98px){.table-responsive-lg{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive-lg>.table-bordered{border:0}}@media (max-width:1199.98px){.table-responsive-xl{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive-xl>.table-bordered{border:0}}.table-responsive{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive>.table-bordered{border:0}.form-control{display:block;width:100%;padding:.375rem .75rem;font-size:.9rem;line-height:1.6;color:#495057;background-color:#fff;background-clip:padding-box;border:1px solid #ced4da;border-radius:.25rem;-webkit-transition:border-color .15s ease-in-out,-webkit-box-shadow .15s ease-in-out;transition:border-color .15s ease-in-out,-webkit-box-shadow .15s ease-in-out;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out,-webkit-box-shadow .15s ease-in-out}.form-control::-ms-expand{background-color:transparent;border:0}.form-control:focus{color:#495057;background-color:#fff;border-color:#80bdff;outline:0;-webkit-box-shadow:0 0 0 .2rem rgba(0,123,255,.25);box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.form-control::-webkit-input-placeholder{color:#6c757d;opacity:1}.form-control:-ms-input-placeholder,.form-control::-ms-input-placeholder{color:#6c757d;opacity:1}.form-control::placeholder{color:#6c757d;opacity:1}.form-control:disabled,.form-control[readonly]{background-color:#e9ecef;opacity:1}select.form-control:not([size]):not([multiple]){height:calc(2.19rem + 2px)}select.form-control:focus::-ms-value{color:#495057;background-color:#fff}.form-control-file,.form-control-range{display:block;width:100%}.col-form-label{padding-top:calc(.375rem + 1px);padding-bottom:calc(.375rem + 1px);margin-bottom:0;font-size:inherit;line-height:1.6}.col-form-label-lg{padding-top:calc(.5rem + 1px);padding-bottom:calc(.5rem + 1px);font-size:1.125rem;line-height:1.5}.col-form-label-sm{padding-top:calc(.25rem + 1px);padding-bottom:calc(.25rem + 1px);font-size:.7875rem;line-height:1.5}.form-control-plaintext{display:block;width:100%;padding-top:.375rem;padding-bottom:.375rem;margin-bottom:0;line-height:1.6;background-color:transparent;border:solid transparent;border-width:1px 0}.form-control-plaintext.form-control-lg,.form-control-plaintext.form-control-sm,.input-group-lg>.form-control-plaintext.form-control,.input-group-lg>.input-group-append>.form-control-plaintext.btn,.input-group-lg>.input-group-append>.form-control-plaintext.input-group-text,.input-group-lg>.input-group-prepend>.form-control-plaintext.btn,.input-group-lg>.input-group-prepend>.form-control-plaintext.input-group-text,.input-group-sm>.form-control-plaintext.form-control,.input-group-sm>.input-group-append>.form-control-plaintext.btn,.input-group-sm>.input-group-append>.form-control-plaintext.input-group-text,.input-group-sm>.input-group-prepend>.form-control-plaintext.btn,.input-group-sm>.input-group-prepend>.form-control-plaintext.input-group-text{padding-right:0;padding-left:0}.form-control-sm,.input-group-sm>.form-control,.input-group-sm>.input-group-append>.btn,.input-group-sm>.input-group-append>.input-group-text,.input-group-sm>.input-group-prepend>.btn,.input-group-sm>.input-group-prepend>.input-group-text{padding:.25rem .5rem;font-size:.7875rem;line-height:1.5;border-radius:.2rem}.input-group-sm>.input-group-append>select.btn:not([size]):not([multiple]),.input-group-sm>.input-group-append>select.input-group-text:not([size]):not([multiple]),.input-group-sm>.input-group-prepend>select.btn:not([size]):not([multiple]),.input-group-sm>.input-group-prepend>select.input-group-text:not([size]):not([multiple]),.input-group-sm>select.form-control:not([size]):not([multiple]),select.form-control-sm:not([size]):not([multiple]){height:calc(1.68125rem + 2px)}.form-control-lg,.input-group-lg>.form-control,.input-group-lg>.input-group-append>.btn,.input-group-lg>.input-group-append>.input-group-text,.input-group-lg>.input-group-prepend>.btn,.input-group-lg>.input-group-prepend>.input-group-text{padding:.5rem 1rem;font-size:1.125rem;line-height:1.5;border-radius:.3rem}.input-group-lg>.input-group-append>select.btn:not([size]):not([multiple]),.input-group-lg>.input-group-append>select.input-group-text:not([size]):not([multiple]),.input-group-lg>.input-group-prepend>select.btn:not([size]):not([multiple]),.input-group-lg>.input-group-prepend>select.input-group-text:not([size]):not([multiple]),.input-group-lg>select.form-control:not([size]):not([multiple]),select.form-control-lg:not([size]):not([multiple]){height:calc(2.6875rem + 2px)}.form-group{margin-bottom:1rem}.form-text{display:block;margin-top:.25rem}.form-row{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-right:-5px;margin-left:-5px}.form-row>.col,.form-row>[class*=col-]{padding-right:5px;padding-left:5px}.form-check{position:relative;display:block;padding-left:1.25rem}.form-check-input{position:absolute;margin-top:.3rem;margin-left:-1.25rem}.form-check-input:disabled~.form-check-label{color:#6c757d}.form-check-label{margin-bottom:0}.form-check-inline{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding-left:0;margin-right:.75rem}.form-check-inline .form-check-input{position:static;margin-top:0;margin-right:.3125rem;margin-left:0}.valid-feedback{display:none;width:100%;margin-top:.25rem;font-size:80%;color:#28a745}.valid-tooltip{position:absolute;top:100%;z-index:5;display:none;max-width:100%;padding:.5rem;margin-top:.1rem;font-size:.875rem;line-height:1;color:#fff;background-color:rgba(40,167,69,.8);border-radius:.2rem}.custom-select.is-valid,.form-control.is-valid,.was-validated .custom-select:valid,.was-validated .form-control:valid{border-color:#28a745}.custom-select.is-valid:focus,.form-control.is-valid:focus,.was-validated .custom-select:valid:focus,.was-validated .form-control:valid:focus{border-color:#28a745;-webkit-box-shadow:0 0 0 .2rem rgba(40,167,69,.25);box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}.custom-select.is-valid~.valid-feedback,.custom-select.is-valid~.valid-tooltip,.form-control.is-valid~.valid-feedback,.form-control.is-valid~.valid-tooltip,.was-validated .custom-select:valid~.valid-feedback,.was-validated .custom-select:valid~.valid-tooltip,.was-validated .form-control:valid~.valid-feedback,.was-validated .form-control:valid~.valid-tooltip{display:block}.form-check-input.is-valid~.form-check-label,.was-validated .form-check-input:valid~.form-check-label{color:#28a745}.form-check-input.is-valid~.valid-feedback,.form-check-input.is-valid~.valid-tooltip,.was-validated .form-check-input:valid~.valid-feedback,.was-validated .form-check-input:valid~.valid-tooltip{display:block}.custom-control-input.is-valid~.custom-control-label,.was-validated .custom-control-input:valid~.custom-control-label{color:#28a745}.custom-control-input.is-valid~.custom-control-label:before,.was-validated .custom-control-input:valid~.custom-control-label:before{background-color:#71dd8a}.custom-control-input.is-valid~.valid-feedback,.custom-control-input.is-valid~.valid-tooltip,.was-validated .custom-control-input:valid~.valid-feedback,.was-validated .custom-control-input:valid~.valid-tooltip{display:block}.custom-control-input.is-valid:checked~.custom-control-label:before,.was-validated .custom-control-input:valid:checked~.custom-control-label:before{background-color:#34ce57}.custom-control-input.is-valid:focus~.custom-control-label:before,.was-validated .custom-control-input:valid:focus~.custom-control-label:before{-webkit-box-shadow:0 0 0 1px #f5f8fa,0 0 0 .2rem rgba(40,167,69,.25);box-shadow:0 0 0 1px #f5f8fa,0 0 0 .2rem rgba(40,167,69,.25)}.custom-file-input.is-valid~.custom-file-label,.was-validated .custom-file-input:valid~.custom-file-label{border-color:#28a745}.custom-file-input.is-valid~.custom-file-label:before,.was-validated .custom-file-input:valid~.custom-file-label:before{border-color:inherit}.custom-file-input.is-valid~.valid-feedback,.custom-file-input.is-valid~.valid-tooltip,.was-validated .custom-file-input:valid~.valid-feedback,.was-validated .custom-file-input:valid~.valid-tooltip{display:block}.custom-file-input.is-valid:focus~.custom-file-label,.was-validated .custom-file-input:valid:focus~.custom-file-label{-webkit-box-shadow:0 0 0 .2rem rgba(40,167,69,.25);box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}.invalid-feedback{display:none;width:100%;margin-top:.25rem;font-size:80%;color:#dc3545}.invalid-tooltip{position:absolute;top:100%;z-index:5;display:none;max-width:100%;padding:.5rem;margin-top:.1rem;font-size:.875rem;line-height:1;color:#fff;background-color:rgba(220,53,69,.8);border-radius:.2rem}.custom-select.is-invalid,.form-control.is-invalid,.was-validated .custom-select:invalid,.was-validated .form-control:invalid{border-color:#dc3545}.custom-select.is-invalid:focus,.form-control.is-invalid:focus,.was-validated .custom-select:invalid:focus,.was-validated .form-control:invalid:focus{border-color:#dc3545;-webkit-box-shadow:0 0 0 .2rem rgba(220,53,69,.25);box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}.custom-select.is-invalid~.invalid-feedback,.custom-select.is-invalid~.invalid-tooltip,.form-control.is-invalid~.invalid-feedback,.form-control.is-invalid~.invalid-tooltip,.was-validated .custom-select:invalid~.invalid-feedback,.was-validated .custom-select:invalid~.invalid-tooltip,.was-validated .form-control:invalid~.invalid-feedback,.was-validated .form-control:invalid~.invalid-tooltip{display:block}.form-check-input.is-invalid~.form-check-label,.was-validated .form-check-input:invalid~.form-check-label{color:#dc3545}.form-check-input.is-invalid~.invalid-feedback,.form-check-input.is-invalid~.invalid-tooltip,.was-validated .form-check-input:invalid~.invalid-feedback,.was-validated .form-check-input:invalid~.invalid-tooltip{display:block}.custom-control-input.is-invalid~.custom-control-label,.was-validated .custom-control-input:invalid~.custom-control-label{color:#dc3545}.custom-control-input.is-invalid~.custom-control-label:before,.was-validated .custom-control-input:invalid~.custom-control-label:before{background-color:#efa2a9}.custom-control-input.is-invalid~.invalid-feedback,.custom-control-input.is-invalid~.invalid-tooltip,.was-validated .custom-control-input:invalid~.invalid-feedback,.was-validated .custom-control-input:invalid~.invalid-tooltip{display:block}.custom-control-input.is-invalid:checked~.custom-control-label:before,.was-validated .custom-control-input:invalid:checked~.custom-control-label:before{background-color:#e4606d}.custom-control-input.is-invalid:focus~.custom-control-label:before,.was-validated .custom-control-input:invalid:focus~.custom-control-label:before{-webkit-box-shadow:0 0 0 1px #f5f8fa,0 0 0 .2rem rgba(220,53,69,.25);box-shadow:0 0 0 1px #f5f8fa,0 0 0 .2rem rgba(220,53,69,.25)}.custom-file-input.is-invalid~.custom-file-label,.was-validated .custom-file-input:invalid~.custom-file-label{border-color:#dc3545}.custom-file-input.is-invalid~.custom-file-label:before,.was-validated .custom-file-input:invalid~.custom-file-label:before{border-color:inherit}.custom-file-input.is-invalid~.invalid-feedback,.custom-file-input.is-invalid~.invalid-tooltip,.was-validated .custom-file-input:invalid~.invalid-feedback,.was-validated .custom-file-input:invalid~.invalid-tooltip{display:block}.custom-file-input.is-invalid:focus~.custom-file-label,.was-validated .custom-file-input:invalid:focus~.custom-file-label{-webkit-box-shadow:0 0 0 .2rem rgba(220,53,69,.25);box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}.form-inline{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row wrap;flex-flow:row wrap;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.form-inline .form-check{width:100%}@media (min-width:576px){.form-inline label{-ms-flex-align:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.form-inline .form-group,.form-inline label{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;align-items:center;margin-bottom:0}.form-inline .form-group{-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row wrap;flex-flow:row wrap;-ms-flex-align:center}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-plaintext{display:inline-block}.form-inline .input-group{width:auto}.form-inline .form-check{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;width:auto;padding-left:0}.form-inline .form-check-input{position:relative;margin-top:0;margin-right:.25rem;margin-left:0}.form-inline .custom-control{-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.form-inline .custom-control-label{margin-bottom:0}}.btn{display:inline-block;font-weight:400;text-align:center;white-space:nowrap;vertical-align:middle;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;border:1px solid transparent;padding:.375rem .75rem;font-size:.9rem;line-height:1.6;border-radius:.25rem;-webkit-transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,-webkit-box-shadow .15s ease-in-out;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,-webkit-box-shadow .15s ease-in-out;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out,-webkit-box-shadow .15s ease-in-out}.btn:focus,.btn:hover{text-decoration:none}.btn.focus,.btn:focus{outline:0;-webkit-box-shadow:0 0 0 .2rem rgba(0,123,255,.25);box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.btn.disabled,.btn:disabled{opacity:.65}.btn:not(:disabled):not(.disabled){cursor:pointer}.btn:not(:disabled):not(.disabled).active,.btn:not(:disabled):not(.disabled):active{background-image:none}a.btn.disabled,fieldset:disabled a.btn{pointer-events:none}.btn-primary{color:#fff;background-color:#007bff;border-color:#007bff}.btn-primary:hover{color:#fff;background-color:#0069d9;border-color:#0062cc}.btn-primary.focus,.btn-primary:focus{-webkit-box-shadow:0 0 0 .2rem rgba(0,123,255,.5);box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.btn-primary.disabled,.btn-primary:disabled{color:#fff;background-color:#007bff;border-color:#007bff}.btn-primary:not(:disabled):not(.disabled).active,.btn-primary:not(:disabled):not(.disabled):active,.show>.btn-primary.dropdown-toggle{color:#fff;background-color:#0062cc;border-color:#005cbf}.btn-primary:not(:disabled):not(.disabled).active:focus,.btn-primary:not(:disabled):not(.disabled):active:focus,.show>.btn-primary.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(0,123,255,.5);box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.btn-secondary{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-secondary:hover{color:#fff;background-color:#5a6268;border-color:#545b62}.btn-secondary.focus,.btn-secondary:focus{-webkit-box-shadow:0 0 0 .2rem hsla(208,7%,46%,.5);box-shadow:0 0 0 .2rem hsla(208,7%,46%,.5)}.btn-secondary.disabled,.btn-secondary:disabled{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-secondary:not(:disabled):not(.disabled).active,.btn-secondary:not(:disabled):not(.disabled):active,.show>.btn-secondary.dropdown-toggle{color:#fff;background-color:#545b62;border-color:#4e555b}.btn-secondary:not(:disabled):not(.disabled).active:focus,.btn-secondary:not(:disabled):not(.disabled):active:focus,.show>.btn-secondary.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem hsla(208,7%,46%,.5);box-shadow:0 0 0 .2rem hsla(208,7%,46%,.5)}.btn-success{color:#fff;background-color:#28a745;border-color:#28a745}.btn-success:hover{color:#fff;background-color:#218838;border-color:#1e7e34}.btn-success.focus,.btn-success:focus{-webkit-box-shadow:0 0 0 .2rem rgba(40,167,69,.5);box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.btn-success.disabled,.btn-success:disabled{color:#fff;background-color:#28a745;border-color:#28a745}.btn-success:not(:disabled):not(.disabled).active,.btn-success:not(:disabled):not(.disabled):active,.show>.btn-success.dropdown-toggle{color:#fff;background-color:#1e7e34;border-color:#1c7430}.btn-success:not(:disabled):not(.disabled).active:focus,.btn-success:not(:disabled):not(.disabled):active:focus,.show>.btn-success.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(40,167,69,.5);box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.btn-info{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-info:hover{color:#fff;background-color:#138496;border-color:#117a8b}.btn-info.focus,.btn-info:focus{-webkit-box-shadow:0 0 0 .2rem rgba(23,162,184,.5);box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.btn-info.disabled,.btn-info:disabled{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-info:not(:disabled):not(.disabled).active,.btn-info:not(:disabled):not(.disabled):active,.show>.btn-info.dropdown-toggle{color:#fff;background-color:#117a8b;border-color:#10707f}.btn-info:not(:disabled):not(.disabled).active:focus,.btn-info:not(:disabled):not(.disabled):active:focus,.show>.btn-info.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(23,162,184,.5);box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.btn-warning{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-warning:hover{color:#212529;background-color:#e0a800;border-color:#d39e00}.btn-warning.focus,.btn-warning:focus{-webkit-box-shadow:0 0 0 .2rem rgba(255,193,7,.5);box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.btn-warning.disabled,.btn-warning:disabled{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-warning:not(:disabled):not(.disabled).active,.btn-warning:not(:disabled):not(.disabled):active,.show>.btn-warning.dropdown-toggle{color:#212529;background-color:#d39e00;border-color:#c69500}.btn-warning:not(:disabled):not(.disabled).active:focus,.btn-warning:not(:disabled):not(.disabled):active:focus,.show>.btn-warning.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(255,193,7,.5);box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.btn-danger{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-danger:hover{color:#fff;background-color:#c82333;border-color:#bd2130}.btn-danger.focus,.btn-danger:focus{-webkit-box-shadow:0 0 0 .2rem rgba(220,53,69,.5);box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.btn-danger.disabled,.btn-danger:disabled{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-danger:not(:disabled):not(.disabled).active,.btn-danger:not(:disabled):not(.disabled):active,.show>.btn-danger.dropdown-toggle{color:#fff;background-color:#bd2130;border-color:#b21f2d}.btn-danger:not(:disabled):not(.disabled).active:focus,.btn-danger:not(:disabled):not(.disabled):active:focus,.show>.btn-danger.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(220,53,69,.5);box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.btn-light{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-light:hover{color:#212529;background-color:#e2e6ea;border-color:#dae0e5}.btn-light.focus,.btn-light:focus{-webkit-box-shadow:0 0 0 .2rem rgba(248,249,250,.5);box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.btn-light.disabled,.btn-light:disabled{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-light:not(:disabled):not(.disabled).active,.btn-light:not(:disabled):not(.disabled):active,.show>.btn-light.dropdown-toggle{color:#212529;background-color:#dae0e5;border-color:#d3d9df}.btn-light:not(:disabled):not(.disabled).active:focus,.btn-light:not(:disabled):not(.disabled):active:focus,.show>.btn-light.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(248,249,250,.5);box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.btn-dark{color:#fff;background-color:#343a40;border-color:#343a40}.btn-dark:hover{color:#fff;background-color:#23272b;border-color:#1d2124}.btn-dark.focus,.btn-dark:focus{-webkit-box-shadow:0 0 0 .2rem rgba(52,58,64,.5);box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.btn-dark.disabled,.btn-dark:disabled{color:#fff;background-color:#343a40;border-color:#343a40}.btn-dark:not(:disabled):not(.disabled).active,.btn-dark:not(:disabled):not(.disabled):active,.show>.btn-dark.dropdown-toggle{color:#fff;background-color:#1d2124;border-color:#171a1d}.btn-dark:not(:disabled):not(.disabled).active:focus,.btn-dark:not(:disabled):not(.disabled):active:focus,.show>.btn-dark.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(52,58,64,.5);box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.btn-outline-primary{color:#007bff;background-color:transparent;background-image:none;border-color:#007bff}.btn-outline-primary:hover{color:#fff;background-color:#007bff;border-color:#007bff}.btn-outline-primary.focus,.btn-outline-primary:focus{-webkit-box-shadow:0 0 0 .2rem rgba(0,123,255,.5);box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.btn-outline-primary.disabled,.btn-outline-primary:disabled{color:#007bff;background-color:transparent}.btn-outline-primary:not(:disabled):not(.disabled).active,.btn-outline-primary:not(:disabled):not(.disabled):active,.show>.btn-outline-primary.dropdown-toggle{color:#fff;background-color:#007bff;border-color:#007bff}.btn-outline-primary:not(:disabled):not(.disabled).active:focus,.btn-outline-primary:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-primary.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(0,123,255,.5);box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.btn-outline-secondary{color:#6c757d;background-color:transparent;background-image:none;border-color:#6c757d}.btn-outline-secondary:hover{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-outline-secondary.focus,.btn-outline-secondary:focus{-webkit-box-shadow:0 0 0 .2rem hsla(208,7%,46%,.5);box-shadow:0 0 0 .2rem hsla(208,7%,46%,.5)}.btn-outline-secondary.disabled,.btn-outline-secondary:disabled{color:#6c757d;background-color:transparent}.btn-outline-secondary:not(:disabled):not(.disabled).active,.btn-outline-secondary:not(:disabled):not(.disabled):active,.show>.btn-outline-secondary.dropdown-toggle{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-outline-secondary:not(:disabled):not(.disabled).active:focus,.btn-outline-secondary:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-secondary.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem hsla(208,7%,46%,.5);box-shadow:0 0 0 .2rem hsla(208,7%,46%,.5)}.btn-outline-success{color:#28a745;background-color:transparent;background-image:none;border-color:#28a745}.btn-outline-success:hover{color:#fff;background-color:#28a745;border-color:#28a745}.btn-outline-success.focus,.btn-outline-success:focus{-webkit-box-shadow:0 0 0 .2rem rgba(40,167,69,.5);box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.btn-outline-success.disabled,.btn-outline-success:disabled{color:#28a745;background-color:transparent}.btn-outline-success:not(:disabled):not(.disabled).active,.btn-outline-success:not(:disabled):not(.disabled):active,.show>.btn-outline-success.dropdown-toggle{color:#fff;background-color:#28a745;border-color:#28a745}.btn-outline-success:not(:disabled):not(.disabled).active:focus,.btn-outline-success:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-success.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(40,167,69,.5);box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.btn-outline-info{color:#17a2b8;background-color:transparent;background-image:none;border-color:#17a2b8}.btn-outline-info:hover{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-outline-info.focus,.btn-outline-info:focus{-webkit-box-shadow:0 0 0 .2rem rgba(23,162,184,.5);box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.btn-outline-info.disabled,.btn-outline-info:disabled{color:#17a2b8;background-color:transparent}.btn-outline-info:not(:disabled):not(.disabled).active,.btn-outline-info:not(:disabled):not(.disabled):active,.show>.btn-outline-info.dropdown-toggle{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-outline-info:not(:disabled):not(.disabled).active:focus,.btn-outline-info:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-info.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(23,162,184,.5);box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.btn-outline-warning{color:#ffc107;background-color:transparent;background-image:none;border-color:#ffc107}.btn-outline-warning:hover{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-outline-warning.focus,.btn-outline-warning:focus{-webkit-box-shadow:0 0 0 .2rem rgba(255,193,7,.5);box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.btn-outline-warning.disabled,.btn-outline-warning:disabled{color:#ffc107;background-color:transparent}.btn-outline-warning:not(:disabled):not(.disabled).active,.btn-outline-warning:not(:disabled):not(.disabled):active,.show>.btn-outline-warning.dropdown-toggle{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-outline-warning:not(:disabled):not(.disabled).active:focus,.btn-outline-warning:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-warning.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(255,193,7,.5);box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.btn-outline-danger{color:#dc3545;background-color:transparent;background-image:none;border-color:#dc3545}.btn-outline-danger:hover{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-outline-danger.focus,.btn-outline-danger:focus{-webkit-box-shadow:0 0 0 .2rem rgba(220,53,69,.5);box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.btn-outline-danger.disabled,.btn-outline-danger:disabled{color:#dc3545;background-color:transparent}.btn-outline-danger:not(:disabled):not(.disabled).active,.btn-outline-danger:not(:disabled):not(.disabled):active,.show>.btn-outline-danger.dropdown-toggle{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-outline-danger:not(:disabled):not(.disabled).active:focus,.btn-outline-danger:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-danger.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(220,53,69,.5);box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.btn-outline-light{color:#f8f9fa;background-color:transparent;background-image:none;border-color:#f8f9fa}.btn-outline-light:hover{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-outline-light.focus,.btn-outline-light:focus{-webkit-box-shadow:0 0 0 .2rem rgba(248,249,250,.5);box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.btn-outline-light.disabled,.btn-outline-light:disabled{color:#f8f9fa;background-color:transparent}.btn-outline-light:not(:disabled):not(.disabled).active,.btn-outline-light:not(:disabled):not(.disabled):active,.show>.btn-outline-light.dropdown-toggle{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-outline-light:not(:disabled):not(.disabled).active:focus,.btn-outline-light:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-light.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(248,249,250,.5);box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.btn-outline-dark{color:#343a40;background-color:transparent;background-image:none;border-color:#343a40}.btn-outline-dark:hover{color:#fff;background-color:#343a40;border-color:#343a40}.btn-outline-dark.focus,.btn-outline-dark:focus{-webkit-box-shadow:0 0 0 .2rem rgba(52,58,64,.5);box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.btn-outline-dark.disabled,.btn-outline-dark:disabled{color:#343a40;background-color:transparent}.btn-outline-dark:not(:disabled):not(.disabled).active,.btn-outline-dark:not(:disabled):not(.disabled):active,.show>.btn-outline-dark.dropdown-toggle{color:#fff;background-color:#343a40;border-color:#343a40}.btn-outline-dark:not(:disabled):not(.disabled).active:focus,.btn-outline-dark:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-dark.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(52,58,64,.5);box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.btn-link{font-weight:400;color:#007bff;background-color:transparent}.btn-link:hover{color:#0056b3;background-color:transparent}.btn-link.focus,.btn-link:focus,.btn-link:hover{text-decoration:underline;border-color:transparent}.btn-link.focus,.btn-link:focus{-webkit-box-shadow:none;box-shadow:none}.btn-link.disabled,.btn-link:disabled{color:#6c757d}.btn-group-lg>.btn,.btn-lg{padding:.5rem 1rem;font-size:1.125rem;line-height:1.5;border-radius:.3rem}.btn-group-sm>.btn,.btn-sm{padding:.25rem .5rem;font-size:.7875rem;line-height:1.5;border-radius:.2rem}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:.5rem}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.fade.show{opacity:1}.collapse{display:none}.collapse.show{display:block}tr.collapse.show{display:table-row}tbody.collapse.show{display:table-row-group}.collapsing{height:0;overflow:hidden;-webkit-transition:height .35s ease;transition:height .35s ease}.collapsing,.dropdown,.dropup{position:relative}.dropdown-toggle:after{display:inline-block;width:0;height:0;margin-left:.255em;vertical-align:.255em;content:"";border-top:.3em solid;border-right:.3em solid transparent;border-bottom:0;border-left:.3em solid transparent}.dropdown-toggle:empty:after{margin-left:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:10rem;padding:.5rem 0;margin:.125rem 0 0;font-size:.9rem;color:#212529;text-align:left;list-style:none;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.15);border-radius:.25rem}.dropup .dropdown-menu{margin-top:0;margin-bottom:.125rem}.dropup .dropdown-toggle:after{display:inline-block;width:0;height:0;margin-left:.255em;vertical-align:.255em;content:"";border-top:0;border-right:.3em solid transparent;border-bottom:.3em solid;border-left:.3em solid transparent}.dropup .dropdown-toggle:empty:after{margin-left:0}.dropright .dropdown-menu{margin-top:0;margin-left:.125rem}.dropright .dropdown-toggle:after{display:inline-block;width:0;height:0;margin-left:.255em;vertical-align:.255em;content:"";border-top:.3em solid transparent;border-bottom:.3em solid transparent;border-left:.3em solid}.dropright .dropdown-toggle:empty:after{margin-left:0}.dropright .dropdown-toggle:after{vertical-align:0}.dropleft .dropdown-menu{margin-top:0;margin-right:.125rem}.dropleft .dropdown-toggle:after{display:inline-block;width:0;height:0;margin-left:.255em;vertical-align:.255em;content:"";display:none}.dropleft .dropdown-toggle:before{display:inline-block;width:0;height:0;margin-right:.255em;vertical-align:.255em;content:"";border-top:.3em solid transparent;border-right:.3em solid;border-bottom:.3em solid transparent}.dropleft .dropdown-toggle:empty:after{margin-left:0}.dropleft .dropdown-toggle:before{vertical-align:0}.dropdown-divider{height:0;margin:.5rem 0;overflow:hidden;border-top:1px solid #e9ecef}.dropdown-item{display:block;width:100%;padding:.25rem 1.5rem;clear:both;font-weight:400;color:#212529;text-align:inherit;white-space:nowrap;background-color:transparent;border:0}.dropdown-item:focus,.dropdown-item:hover{color:#16181b;text-decoration:none;background-color:#f8f9fa}.dropdown-item.active,.dropdown-item:active{color:#fff;text-decoration:none;background-color:#007bff}.dropdown-item.disabled,.dropdown-item:disabled{color:#6c757d;background-color:transparent}.dropdown-menu.show{display:block}.dropdown-header{display:block;padding:.5rem 1.5rem;margin-bottom:0;font-size:.7875rem;color:#6c757d;white-space:nowrap}.btn-group,.btn-group-vertical{position:relative;display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;-webkit-box-flex:0;-ms-flex:0 1 auto;flex:0 1 auto}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:1}.btn-group-vertical .btn+.btn,.btn-group-vertical .btn+.btn-group,.btn-group-vertical .btn-group+.btn,.btn-group-vertical .btn-group+.btn-group,.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.btn-toolbar .input-group{width:auto}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn-group:not(:last-child)>.btn,.btn-group>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:not(:first-child)>.btn,.btn-group>.btn:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.dropdown-toggle-split{padding-right:.5625rem;padding-left:.5625rem}.dropdown-toggle-split:after{margin-left:0}.btn-group-sm>.btn+.dropdown-toggle-split,.btn-sm+.dropdown-toggle-split{padding-right:.375rem;padding-left:.375rem}.btn-group-lg>.btn+.dropdown-toggle-split,.btn-lg+.dropdown-toggle-split{padding-right:.75rem;padding-left:.75rem}.btn-group-vertical{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.btn-group-vertical .btn,.btn-group-vertical .btn-group{width:100%}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn-group:not(:last-child)>.btn,.btn-group-vertical>.btn:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child)>.btn,.btn-group-vertical>.btn:not(:first-child){border-top-left-radius:0;border-top-right-radius:0}.btn-group-toggle>.btn,.btn-group-toggle>.btn-group>.btn{margin-bottom:0}.btn-group-toggle>.btn-group>.btn input[type=checkbox],.btn-group-toggle>.btn-group>.btn input[type=radio],.btn-group-toggle>.btn input[type=checkbox],.btn-group-toggle>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-align:stretch;-ms-flex-align:stretch;align-items:stretch;width:100%}.input-group>.custom-file,.input-group>.custom-select,.input-group>.form-control{position:relative;-webkit-box-flex:1;-ms-flex:1 1 auto;flex:1 1 auto;width:1%;margin-bottom:0}.input-group>.custom-file:focus,.input-group>.custom-select:focus,.input-group>.form-control:focus{z-index:3}.input-group>.custom-file+.custom-file,.input-group>.custom-file+.custom-select,.input-group>.custom-file+.form-control,.input-group>.custom-select+.custom-file,.input-group>.custom-select+.custom-select,.input-group>.custom-select+.form-control,.input-group>.form-control+.custom-file,.input-group>.form-control+.custom-select,.input-group>.form-control+.form-control{margin-left:-1px}.input-group>.custom-select:not(:last-child),.input-group>.form-control:not(:last-child){border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.custom-select:not(:first-child),.input-group>.form-control:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.input-group>.custom-file{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.input-group>.custom-file:not(:last-child) .custom-file-label,.input-group>.custom-file:not(:last-child) .custom-file-label:before{border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.custom-file:not(:first-child) .custom-file-label,.input-group>.custom-file:not(:first-child) .custom-file-label:before{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-append,.input-group-prepend{display:-webkit-box;display:-ms-flexbox;display:flex}.input-group-append .btn,.input-group-prepend .btn{position:relative;z-index:2}.input-group-append .btn+.btn,.input-group-append .btn+.input-group-text,.input-group-append .input-group-text+.btn,.input-group-append .input-group-text+.input-group-text,.input-group-prepend .btn+.btn,.input-group-prepend .btn+.input-group-text,.input-group-prepend .input-group-text+.btn,.input-group-prepend .input-group-text+.input-group-text{margin-left:-1px}.input-group-prepend{margin-right:-1px}.input-group-append{margin-left:-1px}.input-group-text{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:.375rem .75rem;margin-bottom:0;font-size:.9rem;font-weight:400;line-height:1.6;color:#495057;text-align:center;white-space:nowrap;background-color:#e9ecef;border:1px solid #ced4da;border-radius:.25rem}.input-group-text input[type=checkbox],.input-group-text input[type=radio]{margin-top:0}.input-group>.input-group-append:last-child>.btn:not(:last-child):not(.dropdown-toggle),.input-group>.input-group-append:last-child>.input-group-text:not(:last-child),.input-group>.input-group-append:not(:last-child)>.btn,.input-group>.input-group-append:not(:last-child)>.input-group-text,.input-group>.input-group-prepend>.btn,.input-group>.input-group-prepend>.input-group-text{border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.input-group-append>.btn,.input-group>.input-group-append>.input-group-text,.input-group>.input-group-prepend:first-child>.btn:not(:first-child),.input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child),.input-group>.input-group-prepend:not(:first-child)>.btn,.input-group>.input-group-prepend:not(:first-child)>.input-group-text{border-top-left-radius:0;border-bottom-left-radius:0}.custom-control{position:relative;display:block;min-height:1.6rem;padding-left:1.5rem}.custom-control-inline{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;margin-right:1rem}.custom-control-input{position:absolute;z-index:-1;opacity:0}.custom-control-input:checked~.custom-control-label:before{color:#fff;background-color:#007bff}.custom-control-input:focus~.custom-control-label:before{-webkit-box-shadow:0 0 0 1px #f5f8fa,0 0 0 .2rem rgba(0,123,255,.25);box-shadow:0 0 0 1px #f5f8fa,0 0 0 .2rem rgba(0,123,255,.25)}.custom-control-input:active~.custom-control-label:before{color:#fff;background-color:#b3d7ff}.custom-control-input:disabled~.custom-control-label{color:#6c757d}.custom-control-input:disabled~.custom-control-label:before{background-color:#e9ecef}.custom-control-label{margin-bottom:0}.custom-control-label:before{pointer-events:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:#dee2e6}.custom-control-label:after,.custom-control-label:before{position:absolute;top:.3rem;left:0;display:block;width:1rem;height:1rem;content:""}.custom-control-label:after{background-repeat:no-repeat;background-position:50%;background-size:50% 50%}.custom-checkbox .custom-control-label:before{border-radius:.25rem}.custom-checkbox .custom-control-input:checked~.custom-control-label:before{background-color:#007bff}.custom-checkbox .custom-control-input:checked~.custom-control-label:after{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='%23fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E")}.custom-checkbox .custom-control-input:indeterminate~.custom-control-label:before{background-color:#007bff}.custom-checkbox .custom-control-input:indeterminate~.custom-control-label:after{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='%23fff' d='M0 2h4'/%3E%3C/svg%3E")}.custom-checkbox .custom-control-input:disabled:checked~.custom-control-label:before{background-color:rgba(0,123,255,.5)}.custom-checkbox .custom-control-input:disabled:indeterminate~.custom-control-label:before{background-color:rgba(0,123,255,.5)}.custom-radio .custom-control-label:before{border-radius:50%}.custom-radio .custom-control-input:checked~.custom-control-label:before{background-color:#007bff}.custom-radio .custom-control-input:checked~.custom-control-label:after{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='%23fff'/%3E%3C/svg%3E")}.custom-radio .custom-control-input:disabled:checked~.custom-control-label:before{background-color:rgba(0,123,255,.5)}.custom-select{display:inline-block;width:100%;height:calc(2.19rem + 2px);padding:.375rem 1.75rem .375rem .75rem;line-height:1.6;color:#495057;vertical-align:middle;background:#fff url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") no-repeat right .75rem center;background-size:8px 10px;border:1px solid #ced4da;border-radius:.25rem;-webkit-appearance:none;-moz-appearance:none;appearance:none}.custom-select:focus{border-color:#80bdff;outline:0;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.075),0 0 5px rgba(128,189,255,.5);box-shadow:inset 0 1px 2px rgba(0,0,0,.075),0 0 5px rgba(128,189,255,.5)}.custom-select:focus::-ms-value{color:#495057;background-color:#fff}.custom-select[multiple],.custom-select[size]:not([size="1"]){height:auto;padding-right:.75rem;background-image:none}.custom-select:disabled{color:#6c757d;background-color:#e9ecef}.custom-select::-ms-expand{opacity:0}.custom-select-sm{height:calc(1.68125rem + 2px);font-size:75%}.custom-select-lg,.custom-select-sm{padding-top:.375rem;padding-bottom:.375rem}.custom-select-lg{height:calc(2.6875rem + 2px);font-size:125%}.custom-file{display:inline-block;margin-bottom:0}.custom-file,.custom-file-input{position:relative;width:100%;height:calc(2.19rem + 2px)}.custom-file-input{z-index:2;margin:0;opacity:0}.custom-file-input:focus~.custom-file-control{border-color:#80bdff;-webkit-box-shadow:0 0 0 .2rem rgba(0,123,255,.25);box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.custom-file-input:focus~.custom-file-control:before{border-color:#80bdff}.custom-file-input:lang(en)~.custom-file-label:after{content:"Browse"}.custom-file-label{left:0;z-index:1;height:calc(2.19rem + 2px);background-color:#fff;border:1px solid #ced4da;border-radius:.25rem}.custom-file-label,.custom-file-label:after{position:absolute;top:0;right:0;padding:.375rem .75rem;line-height:1.6;color:#495057}.custom-file-label:after{bottom:0;z-index:3;display:block;height:calc((2.19rem + 2px) - 1px * 2);content:"Browse";background-color:#e9ecef;border-left:1px solid #ced4da;border-radius:0 .25rem .25rem 0}.nav{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;padding-left:0;margin-bottom:0;list-style:none}.nav-link{display:block;padding:.5rem 1rem}.nav-link:focus,.nav-link:hover{text-decoration:none}.nav-link.disabled{color:#6c757d}.nav-tabs{border-bottom:1px solid #dee2e6}.nav-tabs .nav-item{margin-bottom:-1px}.nav-tabs .nav-link{border:1px solid transparent;border-top-left-radius:.25rem;border-top-right-radius:.25rem}.nav-tabs .nav-link:focus,.nav-tabs .nav-link:hover{border-color:#e9ecef #e9ecef #dee2e6}.nav-tabs .nav-link.disabled{color:#6c757d;background-color:transparent;border-color:transparent}.nav-tabs .nav-item.show .nav-link,.nav-tabs .nav-link.active{color:#495057;background-color:#f5f8fa;border-color:#dee2e6 #dee2e6 #f5f8fa}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.nav-pills .nav-link{border-radius:.25rem}.nav-pills .nav-link.active,.nav-pills .show>.nav-link{color:#fff;background-color:#007bff}.nav-fill .nav-item{-webkit-box-flex:1;-ms-flex:1 1 auto;flex:1 1 auto;text-align:center}.nav-justified .nav-item{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;text-align:center}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.navbar{position:relative;padding:.5rem 1rem}.navbar,.navbar>.container,.navbar>.container-fluid{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.navbar-brand{display:inline-block;padding-top:.32rem;padding-bottom:.32rem;margin-right:1rem;font-size:1.125rem;line-height:inherit;white-space:nowrap}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-nav{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;padding-left:0;margin-bottom:0;list-style:none}.navbar-nav .nav-link{padding-right:0;padding-left:0}.navbar-nav .dropdown-menu{position:static;float:none}.navbar-text{display:inline-block;padding-top:.5rem;padding-bottom:.5rem}.navbar-collapse{-ms-flex-preferred-size:100%;flex-basis:100%;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.navbar-toggler{padding:.25rem .75rem;font-size:1.125rem;line-height:1;background-color:transparent;border:1px solid transparent;border-radius:.25rem}.navbar-toggler:focus,.navbar-toggler:hover{text-decoration:none}.navbar-toggler:not(:disabled):not(.disabled){cursor:pointer}.navbar-toggler-icon{display:inline-block;width:1.5em;height:1.5em;vertical-align:middle;content:"";background:no-repeat 50%;background-size:100% 100%}@media (max-width:575.98px){.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:576px){.navbar-expand-sm{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-sm,.navbar-expand-sm .navbar-nav{-webkit-box-orient:horizontal;-webkit-box-direction:normal}.navbar-expand-sm .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand-sm .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-sm .navbar-nav .dropdown-menu-right{right:0;left:auto}.navbar-expand-sm .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-sm .navbar-collapse{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-sm .navbar-toggler{display:none}.navbar-expand-sm .dropup .dropdown-menu{top:auto;bottom:100%}}@media (max-width:767.98px){.navbar-expand-md>.container,.navbar-expand-md>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:768px){.navbar-expand-md{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-md,.navbar-expand-md .navbar-nav{-webkit-box-orient:horizontal;-webkit-box-direction:normal}.navbar-expand-md .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand-md .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-md .navbar-nav .dropdown-menu-right{right:0;left:auto}.navbar-expand-md .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-md>.container,.navbar-expand-md>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-md .navbar-collapse{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-md .navbar-toggler{display:none}.navbar-expand-md .dropup .dropdown-menu{top:auto;bottom:100%}}@media (max-width:991.98px){.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:992px){.navbar-expand-lg{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-lg,.navbar-expand-lg .navbar-nav{-webkit-box-orient:horizontal;-webkit-box-direction:normal}.navbar-expand-lg .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand-lg .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-lg .navbar-nav .dropdown-menu-right{right:0;left:auto}.navbar-expand-lg .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-lg .navbar-collapse{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-lg .navbar-toggler{display:none}.navbar-expand-lg .dropup .dropdown-menu{top:auto;bottom:100%}}@media (max-width:1199.98px){.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:1200px){.navbar-expand-xl{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-xl,.navbar-expand-xl .navbar-nav{-webkit-box-orient:horizontal;-webkit-box-direction:normal}.navbar-expand-xl .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand-xl .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-xl .navbar-nav .dropdown-menu-right{right:0;left:auto}.navbar-expand-xl .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-xl .navbar-collapse{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-xl .navbar-toggler{display:none}.navbar-expand-xl .dropup .dropdown-menu{top:auto;bottom:100%}}.navbar-expand{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand>.container,.navbar-expand>.container-fluid{padding-right:0;padding-left:0}.navbar-expand .navbar-nav{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.navbar-expand .navbar-nav .dropdown-menu{position:absolute}.navbar-expand .navbar-nav .dropdown-menu-right{right:0;left:auto}.navbar-expand .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand>.container,.navbar-expand>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand .navbar-collapse{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand .navbar-toggler{display:none}.navbar-expand .dropup .dropdown-menu{top:auto;bottom:100%}.navbar-light .navbar-brand,.navbar-light .navbar-brand:focus,.navbar-light .navbar-brand:hover{color:rgba(0,0,0,.9)}.navbar-light .navbar-nav .nav-link{color:rgba(0,0,0,.5)}.navbar-light .navbar-nav .nav-link:focus,.navbar-light .navbar-nav .nav-link:hover{color:rgba(0,0,0,.7)}.navbar-light .navbar-nav .nav-link.disabled{color:rgba(0,0,0,.3)}.navbar-light .navbar-nav .active>.nav-link,.navbar-light .navbar-nav .nav-link.active,.navbar-light .navbar-nav .nav-link.show,.navbar-light .navbar-nav .show>.nav-link{color:rgba(0,0,0,.9)}.navbar-light .navbar-toggler{color:rgba(0,0,0,.5);border-color:rgba(0,0,0,.1)}.navbar-light .navbar-toggler-icon{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(0, 0, 0, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E")}.navbar-light .navbar-text{color:rgba(0,0,0,.5)}.navbar-light .navbar-text a,.navbar-light .navbar-text a:focus,.navbar-light .navbar-text a:hover{color:rgba(0,0,0,.9)}.navbar-dark .navbar-brand,.navbar-dark .navbar-brand:focus,.navbar-dark .navbar-brand:hover{color:#fff}.navbar-dark .navbar-nav .nav-link{color:hsla(0,0%,100%,.5)}.navbar-dark .navbar-nav .nav-link:focus,.navbar-dark .navbar-nav .nav-link:hover{color:hsla(0,0%,100%,.75)}.navbar-dark .navbar-nav .nav-link.disabled{color:hsla(0,0%,100%,.25)}.navbar-dark .navbar-nav .active>.nav-link,.navbar-dark .navbar-nav .nav-link.active,.navbar-dark .navbar-nav .nav-link.show,.navbar-dark .navbar-nav .show>.nav-link{color:#fff}.navbar-dark .navbar-toggler{color:hsla(0,0%,100%,.5);border-color:hsla(0,0%,100%,.1)}.navbar-dark .navbar-toggler-icon{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(255, 255, 255, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E")}.navbar-dark .navbar-text{color:hsla(0,0%,100%,.5)}.navbar-dark .navbar-text a,.navbar-dark .navbar-text a:focus,.navbar-dark .navbar-text a:hover{color:#fff}.card{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;min-width:0;word-wrap:break-word;background-color:#fff;background-clip:border-box;border:1px solid rgba(0,0,0,.125);border-radius:.25rem}.card>hr{margin-right:0;margin-left:0}.card>.list-group:first-child .list-group-item:first-child{border-top-left-radius:.25rem;border-top-right-radius:.25rem}.card>.list-group:last-child .list-group-item:last-child{border-bottom-right-radius:.25rem;border-bottom-left-radius:.25rem}.card-body{-webkit-box-flex:1;-ms-flex:1 1 auto;flex:1 1 auto;padding:1.25rem}.card-title{margin-bottom:.75rem}.card-subtitle{margin-top:-.375rem}.card-subtitle,.card-text:last-child{margin-bottom:0}.card-link:hover{text-decoration:none}.card-link+.card-link{margin-left:1.25rem}.card-header{padding:.75rem 1.25rem;margin-bottom:0;background-color:rgba(0,0,0,.03);border-bottom:1px solid rgba(0,0,0,.125)}.card-header:first-child{border-radius:calc(.25rem - 1px) calc(.25rem - 1px) 0 0}.card-header+.list-group .list-group-item:first-child{border-top:0}.card-footer{padding:.75rem 1.25rem;background-color:rgba(0,0,0,.03);border-top:1px solid rgba(0,0,0,.125)}.card-footer:last-child{border-radius:0 0 calc(.25rem - 1px) calc(.25rem - 1px)}.card-header-tabs{margin-bottom:-.75rem;border-bottom:0}.card-header-pills,.card-header-tabs{margin-right:-.625rem;margin-left:-.625rem}.card-img-overlay{position:absolute;top:0;right:0;bottom:0;left:0;padding:1.25rem}.card-img{width:100%;border-radius:calc(.25rem - 1px)}.card-img-top{width:100%;border-top-left-radius:calc(.25rem - 1px);border-top-right-radius:calc(.25rem - 1px)}.card-img-bottom{width:100%;border-bottom-right-radius:calc(.25rem - 1px);border-bottom-left-radius:calc(.25rem - 1px)}.card-deck{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.card-deck .card{margin-bottom:15px}@media (min-width:576px){.card-deck{-webkit-box-orient:horizontal;-ms-flex-flow:row wrap;flex-flow:row wrap;margin-right:-15px;margin-left:-15px}.card-deck,.card-deck .card{-webkit-box-direction:normal}.card-deck .card{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-ms-flex:1 0 0%;flex:1 0 0%;-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column;margin-right:15px;margin-bottom:0;margin-left:15px}}.card-group{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.card-group>.card{margin-bottom:15px}@media (min-width:576px){.card-group{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row wrap;flex-flow:row wrap}.card-group>.card{-webkit-box-flex:1;-ms-flex:1 0 0%;flex:1 0 0%;margin-bottom:0}.card-group>.card+.card{margin-left:0;border-left:0}.card-group>.card:first-child{border-top-right-radius:0;border-bottom-right-radius:0}.card-group>.card:first-child .card-header,.card-group>.card:first-child .card-img-top{border-top-right-radius:0}.card-group>.card:first-child .card-footer,.card-group>.card:first-child .card-img-bottom{border-bottom-right-radius:0}.card-group>.card:last-child{border-top-left-radius:0;border-bottom-left-radius:0}.card-group>.card:last-child .card-header,.card-group>.card:last-child .card-img-top{border-top-left-radius:0}.card-group>.card:last-child .card-footer,.card-group>.card:last-child .card-img-bottom{border-bottom-left-radius:0}.card-group>.card:only-child{border-radius:.25rem}.card-group>.card:only-child .card-header,.card-group>.card:only-child .card-img-top{border-top-left-radius:.25rem;border-top-right-radius:.25rem}.card-group>.card:only-child .card-footer,.card-group>.card:only-child .card-img-bottom{border-bottom-right-radius:.25rem;border-bottom-left-radius:.25rem}.card-group>.card:not(:first-child):not(:last-child):not(:only-child),.card-group>.card:not(:first-child):not(:last-child):not(:only-child) .card-footer,.card-group>.card:not(:first-child):not(:last-child):not(:only-child) .card-header,.card-group>.card:not(:first-child):not(:last-child):not(:only-child) .card-img-bottom,.card-group>.card:not(:first-child):not(:last-child):not(:only-child) .card-img-top{border-radius:0}}.card-columns .card{margin-bottom:.75rem}@media (min-width:576px){.card-columns{-webkit-column-count:3;column-count:3;-webkit-column-gap:1.25rem;column-gap:1.25rem}.card-columns .card{display:inline-block;width:100%}}.breadcrumb{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;padding:.75rem 1rem;margin-bottom:1rem;list-style:none;background-color:#e9ecef;border-radius:.25rem}.breadcrumb-item+.breadcrumb-item:before{display:inline-block;padding-right:.5rem;padding-left:.5rem;color:#6c757d;content:"/"}.breadcrumb-item+.breadcrumb-item:hover:before{text-decoration:underline;text-decoration:none}.breadcrumb-item.active{color:#6c757d}.pagination{display:-webkit-box;display:-ms-flexbox;display:flex;padding-left:0;list-style:none;border-radius:.25rem}.page-link{position:relative;display:block;padding:.5rem .75rem;margin-left:-1px;line-height:1.25;color:#007bff;background-color:#fff;border:1px solid #dee2e6}.page-link:hover{color:#0056b3;text-decoration:none;background-color:#e9ecef;border-color:#dee2e6}.page-link:focus{z-index:2;outline:0;-webkit-box-shadow:0 0 0 .2rem rgba(0,123,255,.25);box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.page-link:not(:disabled):not(.disabled){cursor:pointer}.page-item:first-child .page-link{margin-left:0;border-top-left-radius:.25rem;border-bottom-left-radius:.25rem}.page-item:last-child .page-link{border-top-right-radius:.25rem;border-bottom-right-radius:.25rem}.page-item.active .page-link{z-index:1;color:#fff;background-color:#007bff;border-color:#007bff}.page-item.disabled .page-link{color:#6c757d;pointer-events:none;cursor:auto;background-color:#fff;border-color:#dee2e6}.pagination-lg .page-link{padding:.75rem 1.5rem;font-size:1.125rem;line-height:1.5}.pagination-lg .page-item:first-child .page-link{border-top-left-radius:.3rem;border-bottom-left-radius:.3rem}.pagination-lg .page-item:last-child .page-link{border-top-right-radius:.3rem;border-bottom-right-radius:.3rem}.pagination-sm .page-link{padding:.25rem .5rem;font-size:.7875rem;line-height:1.5}.pagination-sm .page-item:first-child .page-link{border-top-left-radius:.2rem;border-bottom-left-radius:.2rem}.pagination-sm .page-item:last-child .page-link{border-top-right-radius:.2rem;border-bottom-right-radius:.2rem}.badge{display:inline-block;padding:.25em .4em;font-size:75%;font-weight:700;line-height:1;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25rem}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.badge-pill{padding-right:.6em;padding-left:.6em;border-radius:10rem}.badge-primary{color:#fff;background-color:#007bff}.badge-primary[href]:focus,.badge-primary[href]:hover{color:#fff;text-decoration:none;background-color:#0062cc}.badge-secondary{color:#fff;background-color:#6c757d}.badge-secondary[href]:focus,.badge-secondary[href]:hover{color:#fff;text-decoration:none;background-color:#545b62}.badge-success{color:#fff;background-color:#28a745}.badge-success[href]:focus,.badge-success[href]:hover{color:#fff;text-decoration:none;background-color:#1e7e34}.badge-info{color:#fff;background-color:#17a2b8}.badge-info[href]:focus,.badge-info[href]:hover{color:#fff;text-decoration:none;background-color:#117a8b}.badge-warning{color:#212529;background-color:#ffc107}.badge-warning[href]:focus,.badge-warning[href]:hover{color:#212529;text-decoration:none;background-color:#d39e00}.badge-danger{color:#fff;background-color:#dc3545}.badge-danger[href]:focus,.badge-danger[href]:hover{color:#fff;text-decoration:none;background-color:#bd2130}.badge-light{color:#212529;background-color:#f8f9fa}.badge-light[href]:focus,.badge-light[href]:hover{color:#212529;text-decoration:none;background-color:#dae0e5}.badge-dark{color:#fff;background-color:#343a40}.badge-dark[href]:focus,.badge-dark[href]:hover{color:#fff;text-decoration:none;background-color:#1d2124}.jumbotron{padding:2rem 1rem;margin-bottom:2rem;background-color:#e9ecef;border-radius:.3rem}@media (min-width:576px){.jumbotron{padding:4rem 2rem}}.jumbotron-fluid{padding-right:0;padding-left:0;border-radius:0}.alert{position:relative;padding:.75rem 1.25rem;margin-bottom:1rem;border:1px solid transparent;border-radius:.25rem}.alert-heading{color:inherit}.alert-link{font-weight:700}.alert-dismissible{padding-right:3.85rem}.alert-dismissible .close{position:absolute;top:0;right:0;padding:.75rem 1.25rem;color:inherit}.alert-primary{color:#004085;background-color:#cce5ff;border-color:#b8daff}.alert-primary hr{border-top-color:#9fcdff}.alert-primary .alert-link{color:#002752}.alert-secondary{color:#383d41;background-color:#e2e3e5;border-color:#d6d8db}.alert-secondary hr{border-top-color:#c8cbcf}.alert-secondary .alert-link{color:#202326}.alert-success{color:#155724;background-color:#d4edda;border-color:#c3e6cb}.alert-success hr{border-top-color:#b1dfbb}.alert-success .alert-link{color:#0b2e13}.alert-info{color:#0c5460;background-color:#d1ecf1;border-color:#bee5eb}.alert-info hr{border-top-color:#abdde5}.alert-info .alert-link{color:#062c33}.alert-warning{color:#856404;background-color:#fff3cd;border-color:#ffeeba}.alert-warning hr{border-top-color:#ffe8a1}.alert-warning .alert-link{color:#533f03}.alert-danger{color:#721c24;background-color:#f8d7da;border-color:#f5c6cb}.alert-danger hr{border-top-color:#f1b0b7}.alert-danger .alert-link{color:#491217}.alert-light{color:#818182;background-color:#fefefe;border-color:#fdfdfe}.alert-light hr{border-top-color:#ececf6}.alert-light .alert-link{color:#686868}.alert-dark{color:#1b1e21;background-color:#d6d8d9;border-color:#c6c8ca}.alert-dark hr{border-top-color:#b9bbbe}.alert-dark .alert-link{color:#040505}@-webkit-keyframes progress-bar-stripes{0%{background-position:1rem 0}to{background-position:0 0}}@keyframes progress-bar-stripes{0%{background-position:1rem 0}to{background-position:0 0}}.progress{height:1rem;overflow:hidden;font-size:.675rem;background-color:#e9ecef;border-radius:.25rem}.progress,.progress-bar{display:-webkit-box;display:-ms-flexbox;display:flex}.progress-bar{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;color:#fff;text-align:center;background-color:#007bff;-webkit-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped{background-image:linear-gradient(45deg,hsla(0,0%,100%,.15) 25%,transparent 0,transparent 50%,hsla(0,0%,100%,.15) 0,hsla(0,0%,100%,.15) 75%,transparent 0,transparent);background-size:1rem 1rem}.progress-bar-animated{-webkit-animation:progress-bar-stripes 1s linear infinite;animation:progress-bar-stripes 1s linear infinite}.media{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start}.media-body{-webkit-box-flex:1;-ms-flex:1;flex:1}.list-group{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;padding-left:0;margin-bottom:0}.list-group-item-action{width:100%;color:#495057;text-align:inherit}.list-group-item-action:focus,.list-group-item-action:hover{color:#495057;text-decoration:none;background-color:#f8f9fa}.list-group-item-action:active{color:#212529;background-color:#e9ecef}.list-group-item{position:relative;display:block;padding:.75rem 1.25rem;margin-bottom:-1px;background-color:#fff;border:1px solid rgba(0,0,0,.125)}.list-group-item:first-child{border-top-left-radius:.25rem;border-top-right-radius:.25rem}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:.25rem;border-bottom-left-radius:.25rem}.list-group-item:focus,.list-group-item:hover{z-index:1;text-decoration:none}.list-group-item.disabled,.list-group-item:disabled{color:#6c757d;background-color:#fff}.list-group-item.active{z-index:2;color:#fff;background-color:#007bff;border-color:#007bff}.list-group-flush .list-group-item{border-right:0;border-left:0;border-radius:0}.list-group-flush:first-child .list-group-item:first-child{border-top:0}.list-group-flush:last-child .list-group-item:last-child{border-bottom:0}.list-group-item-primary{color:#004085;background-color:#b8daff}.list-group-item-primary.list-group-item-action:focus,.list-group-item-primary.list-group-item-action:hover{color:#004085;background-color:#9fcdff}.list-group-item-primary.list-group-item-action.active{color:#fff;background-color:#004085;border-color:#004085}.list-group-item-secondary{color:#383d41;background-color:#d6d8db}.list-group-item-secondary.list-group-item-action:focus,.list-group-item-secondary.list-group-item-action:hover{color:#383d41;background-color:#c8cbcf}.list-group-item-secondary.list-group-item-action.active{color:#fff;background-color:#383d41;border-color:#383d41}.list-group-item-success{color:#155724;background-color:#c3e6cb}.list-group-item-success.list-group-item-action:focus,.list-group-item-success.list-group-item-action:hover{color:#155724;background-color:#b1dfbb}.list-group-item-success.list-group-item-action.active{color:#fff;background-color:#155724;border-color:#155724}.list-group-item-info{color:#0c5460;background-color:#bee5eb}.list-group-item-info.list-group-item-action:focus,.list-group-item-info.list-group-item-action:hover{color:#0c5460;background-color:#abdde5}.list-group-item-info.list-group-item-action.active{color:#fff;background-color:#0c5460;border-color:#0c5460}.list-group-item-warning{color:#856404;background-color:#ffeeba}.list-group-item-warning.list-group-item-action:focus,.list-group-item-warning.list-group-item-action:hover{color:#856404;background-color:#ffe8a1}.list-group-item-warning.list-group-item-action.active{color:#fff;background-color:#856404;border-color:#856404}.list-group-item-danger{color:#721c24;background-color:#f5c6cb}.list-group-item-danger.list-group-item-action:focus,.list-group-item-danger.list-group-item-action:hover{color:#721c24;background-color:#f1b0b7}.list-group-item-danger.list-group-item-action.active{color:#fff;background-color:#721c24;border-color:#721c24}.list-group-item-light{color:#818182;background-color:#fdfdfe}.list-group-item-light.list-group-item-action:focus,.list-group-item-light.list-group-item-action:hover{color:#818182;background-color:#ececf6}.list-group-item-light.list-group-item-action.active{color:#fff;background-color:#818182;border-color:#818182}.list-group-item-dark{color:#1b1e21;background-color:#c6c8ca}.list-group-item-dark.list-group-item-action:focus,.list-group-item-dark.list-group-item-action:hover{color:#1b1e21;background-color:#b9bbbe}.list-group-item-dark.list-group-item-action.active{color:#fff;background-color:#1b1e21;border-color:#1b1e21}.close{float:right;font-size:1.35rem;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.5}.close:focus,.close:hover{color:#000;text-decoration:none;opacity:.75}.close:not(:disabled):not(.disabled){cursor:pointer}button.close{padding:0;background-color:transparent;border:0;-webkit-appearance:none}.modal,.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;outline:0}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:.5rem;pointer-events:none}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;transition:-webkit-transform .3s ease-out;transition:transform .3s ease-out;transition:transform .3s ease-out,-webkit-transform .3s ease-out;-webkit-transform:translateY(-25%);transform:translateY(-25%)}.modal.show .modal-dialog{-webkit-transform:translate(0);transform:translate(0)}.modal-dialog-centered{-webkit-box-align:center;-ms-flex-align:center;align-items:center;min-height:calc(100% - 1rem)}.modal-content,.modal-dialog-centered{display:-webkit-box;display:-ms-flexbox;display:flex}.modal-content{position:relative;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;width:100%;pointer-events:auto;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.2);border-radius:.3rem;outline:0}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0}.modal-backdrop.show{opacity:.5}.modal-header{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;padding:1rem;border-bottom:1px solid #e9ecef;border-top-left-radius:.3rem;border-top-right-radius:.3rem}.modal-header .close{padding:1rem;margin:-1rem -1rem -1rem auto}.modal-title{margin-bottom:0;line-height:1.6}.modal-body{position:relative;-webkit-box-flex:1;-ms-flex:1 1 auto;flex:1 1 auto;padding:1rem}.modal-footer{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;padding:1rem;border-top:1px solid #e9ecef}.modal-footer>:not(:first-child){margin-left:.25rem}.modal-footer>:not(:last-child){margin-right:.25rem}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:576px){.modal-dialog{max-width:500px;margin:1.75rem auto}.modal-dialog-centered{min-height:calc(100% - 3.5rem)}.modal-sm{max-width:300px}}@media (min-width:992px){.modal-lg{max-width:800px}}.tooltip{position:absolute;z-index:1070;display:block;margin:0;font-family:Raleway,sans-serif;font-style:normal;font-weight:400;line-height:1.6;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;white-space:normal;line-break:auto;font-size:.7875rem;word-wrap:break-word;opacity:0}.tooltip.show{opacity:.9}.tooltip .arrow{position:absolute;display:block;width:.8rem;height:.4rem}.tooltip .arrow:before{position:absolute;content:"";border-color:transparent;border-style:solid}.bs-tooltip-auto[x-placement^=top],.bs-tooltip-top{padding:.4rem 0}.bs-tooltip-auto[x-placement^=top] .arrow,.bs-tooltip-top .arrow{bottom:0}.bs-tooltip-auto[x-placement^=top] .arrow:before,.bs-tooltip-top .arrow:before{top:0;border-width:.4rem .4rem 0;border-top-color:#000}.bs-tooltip-auto[x-placement^=right],.bs-tooltip-right{padding:0 .4rem}.bs-tooltip-auto[x-placement^=right] .arrow,.bs-tooltip-right .arrow{left:0;width:.4rem;height:.8rem}.bs-tooltip-auto[x-placement^=right] .arrow:before,.bs-tooltip-right .arrow:before{right:0;border-width:.4rem .4rem .4rem 0;border-right-color:#000}.bs-tooltip-auto[x-placement^=bottom],.bs-tooltip-bottom{padding:.4rem 0}.bs-tooltip-auto[x-placement^=bottom] .arrow,.bs-tooltip-bottom .arrow{top:0}.bs-tooltip-auto[x-placement^=bottom] .arrow:before,.bs-tooltip-bottom .arrow:before{bottom:0;border-width:0 .4rem .4rem;border-bottom-color:#000}.bs-tooltip-auto[x-placement^=left],.bs-tooltip-left{padding:0 .4rem}.bs-tooltip-auto[x-placement^=left] .arrow,.bs-tooltip-left .arrow{right:0;width:.4rem;height:.8rem}.bs-tooltip-auto[x-placement^=left] .arrow:before,.bs-tooltip-left .arrow:before{left:0;border-width:.4rem 0 .4rem .4rem;border-left-color:#000}.tooltip-inner{max-width:200px;padding:.25rem .5rem;color:#fff;text-align:center;background-color:#000;border-radius:.25rem}.popover{top:0;left:0;z-index:1060;max-width:276px;font-family:Raleway,sans-serif;font-style:normal;font-weight:400;line-height:1.6;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;white-space:normal;line-break:auto;font-size:.7875rem;word-wrap:break-word;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.2);border-radius:.3rem}.popover,.popover .arrow{position:absolute;display:block}.popover .arrow{width:1rem;height:.5rem;margin:0 .3rem}.popover .arrow:after,.popover .arrow:before{position:absolute;display:block;content:"";border-color:transparent;border-style:solid}.bs-popover-auto[x-placement^=top],.bs-popover-top{margin-bottom:.5rem}.bs-popover-auto[x-placement^=top] .arrow,.bs-popover-top .arrow{bottom:calc((.5rem + 1px) * -1)}.bs-popover-auto[x-placement^=top] .arrow:after,.bs-popover-auto[x-placement^=top] .arrow:before,.bs-popover-top .arrow:after,.bs-popover-top .arrow:before{border-width:.5rem .5rem 0}.bs-popover-auto[x-placement^=top] .arrow:before,.bs-popover-top .arrow:before{bottom:0;border-top-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=top] .arrow:after,.bs-popover-top .arrow:after{bottom:1px;border-top-color:#fff}.bs-popover-auto[x-placement^=right],.bs-popover-right{margin-left:.5rem}.bs-popover-auto[x-placement^=right] .arrow,.bs-popover-right .arrow{left:calc((.5rem + 1px) * -1);width:.5rem;height:1rem;margin:.3rem 0}.bs-popover-auto[x-placement^=right] .arrow:after,.bs-popover-auto[x-placement^=right] .arrow:before,.bs-popover-right .arrow:after,.bs-popover-right .arrow:before{border-width:.5rem .5rem .5rem 0}.bs-popover-auto[x-placement^=right] .arrow:before,.bs-popover-right .arrow:before{left:0;border-right-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=right] .arrow:after,.bs-popover-right .arrow:after{left:1px;border-right-color:#fff}.bs-popover-auto[x-placement^=bottom],.bs-popover-bottom{margin-top:.5rem}.bs-popover-auto[x-placement^=bottom] .arrow,.bs-popover-bottom .arrow{top:calc((.5rem + 1px) * -1)}.bs-popover-auto[x-placement^=bottom] .arrow:after,.bs-popover-auto[x-placement^=bottom] .arrow:before,.bs-popover-bottom .arrow:after,.bs-popover-bottom .arrow:before{border-width:0 .5rem .5rem}.bs-popover-auto[x-placement^=bottom] .arrow:before,.bs-popover-bottom .arrow:before{top:0;border-bottom-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=bottom] .arrow:after,.bs-popover-bottom .arrow:after{top:1px;border-bottom-color:#fff}.bs-popover-auto[x-placement^=bottom] .popover-header:before,.bs-popover-bottom .popover-header:before{position:absolute;top:0;left:50%;display:block;width:1rem;margin-left:-.5rem;content:"";border-bottom:1px solid #f7f7f7}.bs-popover-auto[x-placement^=left],.bs-popover-left{margin-right:.5rem}.bs-popover-auto[x-placement^=left] .arrow,.bs-popover-left .arrow{right:calc((.5rem + 1px) * -1);width:.5rem;height:1rem;margin:.3rem 0}.bs-popover-auto[x-placement^=left] .arrow:after,.bs-popover-auto[x-placement^=left] .arrow:before,.bs-popover-left .arrow:after,.bs-popover-left .arrow:before{border-width:.5rem 0 .5rem .5rem}.bs-popover-auto[x-placement^=left] .arrow:before,.bs-popover-left .arrow:before{right:0;border-left-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=left] .arrow:after,.bs-popover-left .arrow:after{right:1px;border-left-color:#fff}.popover-header{padding:.5rem .75rem;margin-bottom:0;font-size:.9rem;color:inherit;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-top-left-radius:calc(.3rem - 1px);border-top-right-radius:calc(.3rem - 1px)}.popover-header:empty{display:none}.popover-body{padding:.5rem .75rem;color:#212529}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-item{position:relative;display:none;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:100%;-webkit-transition:-webkit-transform .6s ease;transition:-webkit-transform .6s ease;transition:transform .6s ease;transition:transform .6s ease,-webkit-transform .6s ease;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-item-next,.carousel-item-prev,.carousel-item.active{display:block}.carousel-item-next,.carousel-item-prev{position:absolute;top:0}.carousel-item-next.carousel-item-left,.carousel-item-prev.carousel-item-right{-webkit-transform:translateX(0);transform:translateX(0)}@supports ((-webkit-transform-style:preserve-3d) or (transform-style:preserve-3d)){.carousel-item-next.carousel-item-left,.carousel-item-prev.carousel-item-right{-webkit-transform:translateZ(0);transform:translateZ(0)}}.active.carousel-item-right,.carousel-item-next{-webkit-transform:translateX(100%);transform:translateX(100%)}@supports ((-webkit-transform-style:preserve-3d) or (transform-style:preserve-3d)){.active.carousel-item-right,.carousel-item-next{-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}}.active.carousel-item-left,.carousel-item-prev{-webkit-transform:translateX(-100%);transform:translateX(-100%)}@supports ((-webkit-transform-style:preserve-3d) or (transform-style:preserve-3d)){.active.carousel-item-left,.carousel-item-prev{-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}}.carousel-control-next,.carousel-control-prev{position:absolute;top:0;bottom:0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;width:15%;color:#fff;text-align:center;opacity:.5}.carousel-control-next:focus,.carousel-control-next:hover,.carousel-control-prev:focus,.carousel-control-prev:hover{color:#fff;text-decoration:none;outline:0;opacity:.9}.carousel-control-prev{left:0}.carousel-control-next{right:0}.carousel-control-next-icon,.carousel-control-prev-icon{display:inline-block;width:20px;height:20px;background:transparent no-repeat 50%;background-size:100% 100%}.carousel-control-prev-icon{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 8 8'%3E%3Cpath d='M5.25 0l-4 4 4 4 1.5-1.5-2.5-2.5 2.5-2.5-1.5-1.5z'/%3E%3C/svg%3E")}.carousel-control-next-icon{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 8 8'%3E%3Cpath d='M2.75 0l-1.5 1.5 2.5 2.5-2.5 2.5 1.5 1.5 4-4-4-4z'/%3E%3C/svg%3E")}.carousel-indicators{position:absolute;right:0;bottom:10px;left:0;z-index:15;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;padding-left:0;margin-right:15%;margin-left:15%;list-style:none}.carousel-indicators li{position:relative;-webkit-box-flex:0;-ms-flex:0 1 auto;flex:0 1 auto;width:30px;height:3px;margin-right:3px;margin-left:3px;text-indent:-999px;background-color:hsla(0,0%,100%,.5)}.carousel-indicators li:before{top:-10px}.carousel-indicators li:after,.carousel-indicators li:before{position:absolute;left:0;display:inline-block;width:100%;height:10px;content:""}.carousel-indicators li:after{bottom:-10px}.carousel-indicators .active{background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center}.align-baseline{vertical-align:baseline!important}.align-top{vertical-align:top!important}.align-middle{vertical-align:middle!important}.align-bottom{vertical-align:bottom!important}.align-text-bottom{vertical-align:text-bottom!important}.align-text-top{vertical-align:text-top!important}.bg-primary{background-color:#007bff!important}a.bg-primary:focus,a.bg-primary:hover,button.bg-primary:focus,button.bg-primary:hover{background-color:#0062cc!important}.bg-secondary{background-color:#6c757d!important}a.bg-secondary:focus,a.bg-secondary:hover,button.bg-secondary:focus,button.bg-secondary:hover{background-color:#545b62!important}.bg-success{background-color:#28a745!important}a.bg-success:focus,a.bg-success:hover,button.bg-success:focus,button.bg-success:hover{background-color:#1e7e34!important}.bg-info{background-color:#17a2b8!important}a.bg-info:focus,a.bg-info:hover,button.bg-info:focus,button.bg-info:hover{background-color:#117a8b!important}.bg-warning{background-color:#ffc107!important}a.bg-warning:focus,a.bg-warning:hover,button.bg-warning:focus,button.bg-warning:hover{background-color:#d39e00!important}.bg-danger{background-color:#dc3545!important}a.bg-danger:focus,a.bg-danger:hover,button.bg-danger:focus,button.bg-danger:hover{background-color:#bd2130!important}.bg-light{background-color:#f8f9fa!important}a.bg-light:focus,a.bg-light:hover,button.bg-light:focus,button.bg-light:hover{background-color:#dae0e5!important}.bg-dark{background-color:#343a40!important}a.bg-dark:focus,a.bg-dark:hover,button.bg-dark:focus,button.bg-dark:hover{background-color:#1d2124!important}.bg-white{background-color:#fff!important}.bg-transparent{background-color:transparent!important}.border{border:1px solid #dee2e6!important}.border-top{border-top:1px solid #dee2e6!important}.border-right{border-right:1px solid #dee2e6!important}.border-bottom{border-bottom:1px solid #dee2e6!important}.border-left{border-left:1px solid #dee2e6!important}.border-0{border:0!important}.border-top-0{border-top:0!important}.border-right-0{border-right:0!important}.border-bottom-0{border-bottom:0!important}.border-left-0{border-left:0!important}.border-primary{border-color:#007bff!important}.border-secondary{border-color:#6c757d!important}.border-success{border-color:#28a745!important}.border-info{border-color:#17a2b8!important}.border-warning{border-color:#ffc107!important}.border-danger{border-color:#dc3545!important}.border-light{border-color:#f8f9fa!important}.border-dark{border-color:#343a40!important}.border-white{border-color:#fff!important}.rounded{border-radius:.25rem!important}.rounded-top{border-top-left-radius:.25rem!important}.rounded-right,.rounded-top{border-top-right-radius:.25rem!important}.rounded-bottom,.rounded-right{border-bottom-right-radius:.25rem!important}.rounded-bottom,.rounded-left{border-bottom-left-radius:.25rem!important}.rounded-left{border-top-left-radius:.25rem!important}.rounded-circle{border-radius:50%!important}.rounded-0{border-radius:0!important}.clearfix:after{display:block;clear:both;content:""}.d-none{display:none!important}.d-inline{display:inline!important}.d-inline-block{display:inline-block!important}.d-block{display:block!important}.d-table{display:table!important}.d-table-row{display:table-row!important}.d-table-cell{display:table-cell!important}.d-flex{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important}.d-inline-flex{display:-webkit-inline-box!important;display:-ms-inline-flexbox!important;display:inline-flex!important}@media (min-width:576px){.d-sm-none{display:none!important}.d-sm-inline{display:inline!important}.d-sm-inline-block{display:inline-block!important}.d-sm-block{display:block!important}.d-sm-table{display:table!important}.d-sm-table-row{display:table-row!important}.d-sm-table-cell{display:table-cell!important}.d-sm-flex{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important}.d-sm-inline-flex{display:-webkit-inline-box!important;display:-ms-inline-flexbox!important;display:inline-flex!important}}@media (min-width:768px){.d-md-none{display:none!important}.d-md-inline{display:inline!important}.d-md-inline-block{display:inline-block!important}.d-md-block{display:block!important}.d-md-table{display:table!important}.d-md-table-row{display:table-row!important}.d-md-table-cell{display:table-cell!important}.d-md-flex{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important}.d-md-inline-flex{display:-webkit-inline-box!important;display:-ms-inline-flexbox!important;display:inline-flex!important}}@media (min-width:992px){.d-lg-none{display:none!important}.d-lg-inline{display:inline!important}.d-lg-inline-block{display:inline-block!important}.d-lg-block{display:block!important}.d-lg-table{display:table!important}.d-lg-table-row{display:table-row!important}.d-lg-table-cell{display:table-cell!important}.d-lg-flex{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important}.d-lg-inline-flex{display:-webkit-inline-box!important;display:-ms-inline-flexbox!important;display:inline-flex!important}}@media (min-width:1200px){.d-xl-none{display:none!important}.d-xl-inline{display:inline!important}.d-xl-inline-block{display:inline-block!important}.d-xl-block{display:block!important}.d-xl-table{display:table!important}.d-xl-table-row{display:table-row!important}.d-xl-table-cell{display:table-cell!important}.d-xl-flex{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important}.d-xl-inline-flex{display:-webkit-inline-box!important;display:-ms-inline-flexbox!important;display:inline-flex!important}}@media print{.d-print-none{display:none!important}.d-print-inline{display:inline!important}.d-print-inline-block{display:inline-block!important}.d-print-block{display:block!important}.d-print-table{display:table!important}.d-print-table-row{display:table-row!important}.d-print-table-cell{display:table-cell!important}.d-print-flex{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important}.d-print-inline-flex{display:-webkit-inline-box!important;display:-ms-inline-flexbox!important;display:inline-flex!important}}.embed-responsive{position:relative;display:block;width:100%;padding:0;overflow:hidden}.embed-responsive:before{display:block;content:""}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-21by9:before{padding-top:42.85714286%}.embed-responsive-16by9:before{padding-top:56.25%}.embed-responsive-4by3:before{padding-top:75%}.embed-responsive-1by1:before{padding-top:100%}.flex-row{-webkit-box-orient:horizontal!important;-ms-flex-direction:row!important;flex-direction:row!important}.flex-column,.flex-row{-webkit-box-direction:normal!important}.flex-column{-webkit-box-orient:vertical!important;-ms-flex-direction:column!important;flex-direction:column!important}.flex-row-reverse{-webkit-box-orient:horizontal!important;-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-column-reverse,.flex-row-reverse{-webkit-box-direction:reverse!important}.flex-column-reverse{-webkit-box-orient:vertical!important;-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.justify-content-start{-webkit-box-pack:start!important;-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-end{-webkit-box-pack:end!important;-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-center{-webkit-box-pack:center!important;-ms-flex-pack:center!important;justify-content:center!important}.justify-content-between{-webkit-box-pack:justify!important;-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-start{-webkit-box-align:start!important;-ms-flex-align:start!important;align-items:flex-start!important}.align-items-end{-webkit-box-align:end!important;-ms-flex-align:end!important;align-items:flex-end!important}.align-items-center{-webkit-box-align:center!important;-ms-flex-align:center!important;align-items:center!important}.align-items-baseline{-webkit-box-align:baseline!important;-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-stretch{-webkit-box-align:stretch!important;-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}@media (min-width:576px){.flex-sm-row{-webkit-box-orient:horizontal!important;-ms-flex-direction:row!important;flex-direction:row!important}.flex-sm-column,.flex-sm-row{-webkit-box-direction:normal!important}.flex-sm-column{-webkit-box-orient:vertical!important;-ms-flex-direction:column!important;flex-direction:column!important}.flex-sm-row-reverse{-webkit-box-orient:horizontal!important;-webkit-box-direction:reverse!important;-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-sm-column-reverse{-webkit-box-orient:vertical!important;-webkit-box-direction:reverse!important;-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-sm-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-sm-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-sm-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.justify-content-sm-start{-webkit-box-pack:start!important;-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-sm-end{-webkit-box-pack:end!important;-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-sm-center{-webkit-box-pack:center!important;-ms-flex-pack:center!important;justify-content:center!important}.justify-content-sm-between{-webkit-box-pack:justify!important;-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-sm-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-sm-start{-webkit-box-align:start!important;-ms-flex-align:start!important;align-items:flex-start!important}.align-items-sm-end{-webkit-box-align:end!important;-ms-flex-align:end!important;align-items:flex-end!important}.align-items-sm-center{-webkit-box-align:center!important;-ms-flex-align:center!important;align-items:center!important}.align-items-sm-baseline{-webkit-box-align:baseline!important;-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-sm-stretch{-webkit-box-align:stretch!important;-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-sm-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-sm-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-sm-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-sm-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-sm-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-sm-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-sm-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-sm-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-sm-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-sm-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-sm-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-sm-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}@media (min-width:768px){.flex-md-row{-webkit-box-orient:horizontal!important;-ms-flex-direction:row!important;flex-direction:row!important}.flex-md-column,.flex-md-row{-webkit-box-direction:normal!important}.flex-md-column{-webkit-box-orient:vertical!important;-ms-flex-direction:column!important;flex-direction:column!important}.flex-md-row-reverse{-webkit-box-orient:horizontal!important;-webkit-box-direction:reverse!important;-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-md-column-reverse{-webkit-box-orient:vertical!important;-webkit-box-direction:reverse!important;-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-md-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-md-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-md-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.justify-content-md-start{-webkit-box-pack:start!important;-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-md-end{-webkit-box-pack:end!important;-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-md-center{-webkit-box-pack:center!important;-ms-flex-pack:center!important;justify-content:center!important}.justify-content-md-between{-webkit-box-pack:justify!important;-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-md-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-md-start{-webkit-box-align:start!important;-ms-flex-align:start!important;align-items:flex-start!important}.align-items-md-end{-webkit-box-align:end!important;-ms-flex-align:end!important;align-items:flex-end!important}.align-items-md-center{-webkit-box-align:center!important;-ms-flex-align:center!important;align-items:center!important}.align-items-md-baseline{-webkit-box-align:baseline!important;-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-md-stretch{-webkit-box-align:stretch!important;-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-md-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-md-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-md-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-md-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-md-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-md-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-md-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-md-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-md-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-md-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-md-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-md-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}@media (min-width:992px){.flex-lg-row{-webkit-box-orient:horizontal!important;-ms-flex-direction:row!important;flex-direction:row!important}.flex-lg-column,.flex-lg-row{-webkit-box-direction:normal!important}.flex-lg-column{-webkit-box-orient:vertical!important;-ms-flex-direction:column!important;flex-direction:column!important}.flex-lg-row-reverse{-webkit-box-orient:horizontal!important;-webkit-box-direction:reverse!important;-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-lg-column-reverse{-webkit-box-orient:vertical!important;-webkit-box-direction:reverse!important;-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-lg-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-lg-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-lg-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.justify-content-lg-start{-webkit-box-pack:start!important;-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-lg-end{-webkit-box-pack:end!important;-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-lg-center{-webkit-box-pack:center!important;-ms-flex-pack:center!important;justify-content:center!important}.justify-content-lg-between{-webkit-box-pack:justify!important;-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-lg-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-lg-start{-webkit-box-align:start!important;-ms-flex-align:start!important;align-items:flex-start!important}.align-items-lg-end{-webkit-box-align:end!important;-ms-flex-align:end!important;align-items:flex-end!important}.align-items-lg-center{-webkit-box-align:center!important;-ms-flex-align:center!important;align-items:center!important}.align-items-lg-baseline{-webkit-box-align:baseline!important;-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-lg-stretch{-webkit-box-align:stretch!important;-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-lg-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-lg-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-lg-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-lg-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-lg-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-lg-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-lg-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-lg-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-lg-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-lg-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-lg-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-lg-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}@media (min-width:1200px){.flex-xl-row{-webkit-box-orient:horizontal!important;-ms-flex-direction:row!important;flex-direction:row!important}.flex-xl-column,.flex-xl-row{-webkit-box-direction:normal!important}.flex-xl-column{-webkit-box-orient:vertical!important;-ms-flex-direction:column!important;flex-direction:column!important}.flex-xl-row-reverse{-webkit-box-orient:horizontal!important;-webkit-box-direction:reverse!important;-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-xl-column-reverse{-webkit-box-orient:vertical!important;-webkit-box-direction:reverse!important;-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-xl-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-xl-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-xl-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.justify-content-xl-start{-webkit-box-pack:start!important;-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-xl-end{-webkit-box-pack:end!important;-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-xl-center{-webkit-box-pack:center!important;-ms-flex-pack:center!important;justify-content:center!important}.justify-content-xl-between{-webkit-box-pack:justify!important;-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-xl-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-xl-start{-webkit-box-align:start!important;-ms-flex-align:start!important;align-items:flex-start!important}.align-items-xl-end{-webkit-box-align:end!important;-ms-flex-align:end!important;align-items:flex-end!important}.align-items-xl-center{-webkit-box-align:center!important;-ms-flex-align:center!important;align-items:center!important}.align-items-xl-baseline{-webkit-box-align:baseline!important;-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-xl-stretch{-webkit-box-align:stretch!important;-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-xl-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-xl-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-xl-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-xl-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-xl-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-xl-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-xl-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-xl-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-xl-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-xl-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-xl-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-xl-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}.float-left{float:left!important}.float-right{float:right!important}.float-none{float:none!important}@media (min-width:576px){.float-sm-left{float:left!important}.float-sm-right{float:right!important}.float-sm-none{float:none!important}}@media (min-width:768px){.float-md-left{float:left!important}.float-md-right{float:right!important}.float-md-none{float:none!important}}@media (min-width:992px){.float-lg-left{float:left!important}.float-lg-right{float:right!important}.float-lg-none{float:none!important}}@media (min-width:1200px){.float-xl-left{float:left!important}.float-xl-right{float:right!important}.float-xl-none{float:none!important}}.position-static{position:static!important}.position-relative{position:relative!important}.position-absolute{position:absolute!important}.position-fixed{position:fixed!important}.position-sticky{position:-webkit-sticky!important;position:sticky!important}.fixed-top{top:0}.fixed-bottom,.fixed-top{position:fixed;right:0;left:0;z-index:1030}.fixed-bottom{bottom:0}@supports ((position:-webkit-sticky) or (position:sticky)){.sticky-top{position:-webkit-sticky;position:sticky;top:0;z-index:1020}}.sr-only{position:absolute;width:1px;height:1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;-webkit-clip-path:inset(50%);clip-path:inset(50%);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;overflow:visible;clip:auto;white-space:normal;-webkit-clip-path:none;clip-path:none}.w-25{width:25%!important}.w-50{width:50%!important}.w-75{width:75%!important}.w-100{width:100%!important}.h-25{height:25%!important}.h-50{height:50%!important}.h-75{height:75%!important}.h-100{height:100%!important}.mw-100{max-width:100%!important}.mh-100{max-height:100%!important}.m-0{margin:0!important}.mt-0,.my-0{margin-top:0!important}.mr-0,.mx-0{margin-right:0!important}.mb-0,.my-0{margin-bottom:0!important}.ml-0,.mx-0{margin-left:0!important}.m-1{margin:.25rem!important}.mt-1,.my-1{margin-top:.25rem!important}.mr-1,.mx-1{margin-right:.25rem!important}.mb-1,.my-1{margin-bottom:.25rem!important}.ml-1,.mx-1{margin-left:.25rem!important}.m-2{margin:.5rem!important}.mt-2,.my-2{margin-top:.5rem!important}.mr-2,.mx-2{margin-right:.5rem!important}.mb-2,.my-2{margin-bottom:.5rem!important}.ml-2,.mx-2{margin-left:.5rem!important}.m-3{margin:1rem!important}.mt-3,.my-3{margin-top:1rem!important}.mr-3,.mx-3{margin-right:1rem!important}.mb-3,.my-3{margin-bottom:1rem!important}.ml-3,.mx-3{margin-left:1rem!important}.m-4{margin:1.5rem!important}.mt-4,.my-4{margin-top:1.5rem!important}.mr-4,.mx-4{margin-right:1.5rem!important}.mb-4,.my-4{margin-bottom:1.5rem!important}.ml-4,.mx-4{margin-left:1.5rem!important}.m-5{margin:3rem!important}.mt-5,.my-5{margin-top:3rem!important}.mr-5,.mx-5{margin-right:3rem!important}.mb-5,.my-5{margin-bottom:3rem!important}.ml-5,.mx-5{margin-left:3rem!important}.p-0{padding:0!important}.pt-0,.py-0{padding-top:0!important}.pr-0,.px-0{padding-right:0!important}.pb-0,.py-0{padding-bottom:0!important}.pl-0,.px-0{padding-left:0!important}.p-1{padding:.25rem!important}.pt-1,.py-1{padding-top:.25rem!important}.pr-1,.px-1{padding-right:.25rem!important}.pb-1,.py-1{padding-bottom:.25rem!important}.pl-1,.px-1{padding-left:.25rem!important}.p-2{padding:.5rem!important}.pt-2,.py-2{padding-top:.5rem!important}.pr-2,.px-2{padding-right:.5rem!important}.pb-2,.py-2{padding-bottom:.5rem!important}.pl-2,.px-2{padding-left:.5rem!important}.p-3{padding:1rem!important}.pt-3,.py-3{padding-top:1rem!important}.pr-3,.px-3{padding-right:1rem!important}.pb-3,.py-3{padding-bottom:1rem!important}.pl-3,.px-3{padding-left:1rem!important}.p-4{padding:1.5rem!important}.pt-4,.py-4{padding-top:1.5rem!important}.pr-4,.px-4{padding-right:1.5rem!important}.pb-4,.py-4{padding-bottom:1.5rem!important}.pl-4,.px-4{padding-left:1.5rem!important}.p-5{padding:3rem!important}.pt-5,.py-5{padding-top:3rem!important}.pr-5,.px-5{padding-right:3rem!important}.pb-5,.py-5{padding-bottom:3rem!important}.pl-5,.px-5{padding-left:3rem!important}.m-auto{margin:auto!important}.mt-auto,.my-auto{margin-top:auto!important}.mr-auto,.mx-auto{margin-right:auto!important}.mb-auto,.my-auto{margin-bottom:auto!important}.ml-auto,.mx-auto{margin-left:auto!important}@media (min-width:576px){.m-sm-0{margin:0!important}.mt-sm-0,.my-sm-0{margin-top:0!important}.mr-sm-0,.mx-sm-0{margin-right:0!important}.mb-sm-0,.my-sm-0{margin-bottom:0!important}.ml-sm-0,.mx-sm-0{margin-left:0!important}.m-sm-1{margin:.25rem!important}.mt-sm-1,.my-sm-1{margin-top:.25rem!important}.mr-sm-1,.mx-sm-1{margin-right:.25rem!important}.mb-sm-1,.my-sm-1{margin-bottom:.25rem!important}.ml-sm-1,.mx-sm-1{margin-left:.25rem!important}.m-sm-2{margin:.5rem!important}.mt-sm-2,.my-sm-2{margin-top:.5rem!important}.mr-sm-2,.mx-sm-2{margin-right:.5rem!important}.mb-sm-2,.my-sm-2{margin-bottom:.5rem!important}.ml-sm-2,.mx-sm-2{margin-left:.5rem!important}.m-sm-3{margin:1rem!important}.mt-sm-3,.my-sm-3{margin-top:1rem!important}.mr-sm-3,.mx-sm-3{margin-right:1rem!important}.mb-sm-3,.my-sm-3{margin-bottom:1rem!important}.ml-sm-3,.mx-sm-3{margin-left:1rem!important}.m-sm-4{margin:1.5rem!important}.mt-sm-4,.my-sm-4{margin-top:1.5rem!important}.mr-sm-4,.mx-sm-4{margin-right:1.5rem!important}.mb-sm-4,.my-sm-4{margin-bottom:1.5rem!important}.ml-sm-4,.mx-sm-4{margin-left:1.5rem!important}.m-sm-5{margin:3rem!important}.mt-sm-5,.my-sm-5{margin-top:3rem!important}.mr-sm-5,.mx-sm-5{margin-right:3rem!important}.mb-sm-5,.my-sm-5{margin-bottom:3rem!important}.ml-sm-5,.mx-sm-5{margin-left:3rem!important}.p-sm-0{padding:0!important}.pt-sm-0,.py-sm-0{padding-top:0!important}.pr-sm-0,.px-sm-0{padding-right:0!important}.pb-sm-0,.py-sm-0{padding-bottom:0!important}.pl-sm-0,.px-sm-0{padding-left:0!important}.p-sm-1{padding:.25rem!important}.pt-sm-1,.py-sm-1{padding-top:.25rem!important}.pr-sm-1,.px-sm-1{padding-right:.25rem!important}.pb-sm-1,.py-sm-1{padding-bottom:.25rem!important}.pl-sm-1,.px-sm-1{padding-left:.25rem!important}.p-sm-2{padding:.5rem!important}.pt-sm-2,.py-sm-2{padding-top:.5rem!important}.pr-sm-2,.px-sm-2{padding-right:.5rem!important}.pb-sm-2,.py-sm-2{padding-bottom:.5rem!important}.pl-sm-2,.px-sm-2{padding-left:.5rem!important}.p-sm-3{padding:1rem!important}.pt-sm-3,.py-sm-3{padding-top:1rem!important}.pr-sm-3,.px-sm-3{padding-right:1rem!important}.pb-sm-3,.py-sm-3{padding-bottom:1rem!important}.pl-sm-3,.px-sm-3{padding-left:1rem!important}.p-sm-4{padding:1.5rem!important}.pt-sm-4,.py-sm-4{padding-top:1.5rem!important}.pr-sm-4,.px-sm-4{padding-right:1.5rem!important}.pb-sm-4,.py-sm-4{padding-bottom:1.5rem!important}.pl-sm-4,.px-sm-4{padding-left:1.5rem!important}.p-sm-5{padding:3rem!important}.pt-sm-5,.py-sm-5{padding-top:3rem!important}.pr-sm-5,.px-sm-5{padding-right:3rem!important}.pb-sm-5,.py-sm-5{padding-bottom:3rem!important}.pl-sm-5,.px-sm-5{padding-left:3rem!important}.m-sm-auto{margin:auto!important}.mt-sm-auto,.my-sm-auto{margin-top:auto!important}.mr-sm-auto,.mx-sm-auto{margin-right:auto!important}.mb-sm-auto,.my-sm-auto{margin-bottom:auto!important}.ml-sm-auto,.mx-sm-auto{margin-left:auto!important}}@media (min-width:768px){.m-md-0{margin:0!important}.mt-md-0,.my-md-0{margin-top:0!important}.mr-md-0,.mx-md-0{margin-right:0!important}.mb-md-0,.my-md-0{margin-bottom:0!important}.ml-md-0,.mx-md-0{margin-left:0!important}.m-md-1{margin:.25rem!important}.mt-md-1,.my-md-1{margin-top:.25rem!important}.mr-md-1,.mx-md-1{margin-right:.25rem!important}.mb-md-1,.my-md-1{margin-bottom:.25rem!important}.ml-md-1,.mx-md-1{margin-left:.25rem!important}.m-md-2{margin:.5rem!important}.mt-md-2,.my-md-2{margin-top:.5rem!important}.mr-md-2,.mx-md-2{margin-right:.5rem!important}.mb-md-2,.my-md-2{margin-bottom:.5rem!important}.ml-md-2,.mx-md-2{margin-left:.5rem!important}.m-md-3{margin:1rem!important}.mt-md-3,.my-md-3{margin-top:1rem!important}.mr-md-3,.mx-md-3{margin-right:1rem!important}.mb-md-3,.my-md-3{margin-bottom:1rem!important}.ml-md-3,.mx-md-3{margin-left:1rem!important}.m-md-4{margin:1.5rem!important}.mt-md-4,.my-md-4{margin-top:1.5rem!important}.mr-md-4,.mx-md-4{margin-right:1.5rem!important}.mb-md-4,.my-md-4{margin-bottom:1.5rem!important}.ml-md-4,.mx-md-4{margin-left:1.5rem!important}.m-md-5{margin:3rem!important}.mt-md-5,.my-md-5{margin-top:3rem!important}.mr-md-5,.mx-md-5{margin-right:3rem!important}.mb-md-5,.my-md-5{margin-bottom:3rem!important}.ml-md-5,.mx-md-5{margin-left:3rem!important}.p-md-0{padding:0!important}.pt-md-0,.py-md-0{padding-top:0!important}.pr-md-0,.px-md-0{padding-right:0!important}.pb-md-0,.py-md-0{padding-bottom:0!important}.pl-md-0,.px-md-0{padding-left:0!important}.p-md-1{padding:.25rem!important}.pt-md-1,.py-md-1{padding-top:.25rem!important}.pr-md-1,.px-md-1{padding-right:.25rem!important}.pb-md-1,.py-md-1{padding-bottom:.25rem!important}.pl-md-1,.px-md-1{padding-left:.25rem!important}.p-md-2{padding:.5rem!important}.pt-md-2,.py-md-2{padding-top:.5rem!important}.pr-md-2,.px-md-2{padding-right:.5rem!important}.pb-md-2,.py-md-2{padding-bottom:.5rem!important}.pl-md-2,.px-md-2{padding-left:.5rem!important}.p-md-3{padding:1rem!important}.pt-md-3,.py-md-3{padding-top:1rem!important}.pr-md-3,.px-md-3{padding-right:1rem!important}.pb-md-3,.py-md-3{padding-bottom:1rem!important}.pl-md-3,.px-md-3{padding-left:1rem!important}.p-md-4{padding:1.5rem!important}.pt-md-4,.py-md-4{padding-top:1.5rem!important}.pr-md-4,.px-md-4{padding-right:1.5rem!important}.pb-md-4,.py-md-4{padding-bottom:1.5rem!important}.pl-md-4,.px-md-4{padding-left:1.5rem!important}.p-md-5{padding:3rem!important}.pt-md-5,.py-md-5{padding-top:3rem!important}.pr-md-5,.px-md-5{padding-right:3rem!important}.pb-md-5,.py-md-5{padding-bottom:3rem!important}.pl-md-5,.px-md-5{padding-left:3rem!important}.m-md-auto{margin:auto!important}.mt-md-auto,.my-md-auto{margin-top:auto!important}.mr-md-auto,.mx-md-auto{margin-right:auto!important}.mb-md-auto,.my-md-auto{margin-bottom:auto!important}.ml-md-auto,.mx-md-auto{margin-left:auto!important}}@media (min-width:992px){.m-lg-0{margin:0!important}.mt-lg-0,.my-lg-0{margin-top:0!important}.mr-lg-0,.mx-lg-0{margin-right:0!important}.mb-lg-0,.my-lg-0{margin-bottom:0!important}.ml-lg-0,.mx-lg-0{margin-left:0!important}.m-lg-1{margin:.25rem!important}.mt-lg-1,.my-lg-1{margin-top:.25rem!important}.mr-lg-1,.mx-lg-1{margin-right:.25rem!important}.mb-lg-1,.my-lg-1{margin-bottom:.25rem!important}.ml-lg-1,.mx-lg-1{margin-left:.25rem!important}.m-lg-2{margin:.5rem!important}.mt-lg-2,.my-lg-2{margin-top:.5rem!important}.mr-lg-2,.mx-lg-2{margin-right:.5rem!important}.mb-lg-2,.my-lg-2{margin-bottom:.5rem!important}.ml-lg-2,.mx-lg-2{margin-left:.5rem!important}.m-lg-3{margin:1rem!important}.mt-lg-3,.my-lg-3{margin-top:1rem!important}.mr-lg-3,.mx-lg-3{margin-right:1rem!important}.mb-lg-3,.my-lg-3{margin-bottom:1rem!important}.ml-lg-3,.mx-lg-3{margin-left:1rem!important}.m-lg-4{margin:1.5rem!important}.mt-lg-4,.my-lg-4{margin-top:1.5rem!important}.mr-lg-4,.mx-lg-4{margin-right:1.5rem!important}.mb-lg-4,.my-lg-4{margin-bottom:1.5rem!important}.ml-lg-4,.mx-lg-4{margin-left:1.5rem!important}.m-lg-5{margin:3rem!important}.mt-lg-5,.my-lg-5{margin-top:3rem!important}.mr-lg-5,.mx-lg-5{margin-right:3rem!important}.mb-lg-5,.my-lg-5{margin-bottom:3rem!important}.ml-lg-5,.mx-lg-5{margin-left:3rem!important}.p-lg-0{padding:0!important}.pt-lg-0,.py-lg-0{padding-top:0!important}.pr-lg-0,.px-lg-0{padding-right:0!important}.pb-lg-0,.py-lg-0{padding-bottom:0!important}.pl-lg-0,.px-lg-0{padding-left:0!important}.p-lg-1{padding:.25rem!important}.pt-lg-1,.py-lg-1{padding-top:.25rem!important}.pr-lg-1,.px-lg-1{padding-right:.25rem!important}.pb-lg-1,.py-lg-1{padding-bottom:.25rem!important}.pl-lg-1,.px-lg-1{padding-left:.25rem!important}.p-lg-2{padding:.5rem!important}.pt-lg-2,.py-lg-2{padding-top:.5rem!important}.pr-lg-2,.px-lg-2{padding-right:.5rem!important}.pb-lg-2,.py-lg-2{padding-bottom:.5rem!important}.pl-lg-2,.px-lg-2{padding-left:.5rem!important}.p-lg-3{padding:1rem!important}.pt-lg-3,.py-lg-3{padding-top:1rem!important}.pr-lg-3,.px-lg-3{padding-right:1rem!important}.pb-lg-3,.py-lg-3{padding-bottom:1rem!important}.pl-lg-3,.px-lg-3{padding-left:1rem!important}.p-lg-4{padding:1.5rem!important}.pt-lg-4,.py-lg-4{padding-top:1.5rem!important}.pr-lg-4,.px-lg-4{padding-right:1.5rem!important}.pb-lg-4,.py-lg-4{padding-bottom:1.5rem!important}.pl-lg-4,.px-lg-4{padding-left:1.5rem!important}.p-lg-5{padding:3rem!important}.pt-lg-5,.py-lg-5{padding-top:3rem!important}.pr-lg-5,.px-lg-5{padding-right:3rem!important}.pb-lg-5,.py-lg-5{padding-bottom:3rem!important}.pl-lg-5,.px-lg-5{padding-left:3rem!important}.m-lg-auto{margin:auto!important}.mt-lg-auto,.my-lg-auto{margin-top:auto!important}.mr-lg-auto,.mx-lg-auto{margin-right:auto!important}.mb-lg-auto,.my-lg-auto{margin-bottom:auto!important}.ml-lg-auto,.mx-lg-auto{margin-left:auto!important}}@media (min-width:1200px){.m-xl-0{margin:0!important}.mt-xl-0,.my-xl-0{margin-top:0!important}.mr-xl-0,.mx-xl-0{margin-right:0!important}.mb-xl-0,.my-xl-0{margin-bottom:0!important}.ml-xl-0,.mx-xl-0{margin-left:0!important}.m-xl-1{margin:.25rem!important}.mt-xl-1,.my-xl-1{margin-top:.25rem!important}.mr-xl-1,.mx-xl-1{margin-right:.25rem!important}.mb-xl-1,.my-xl-1{margin-bottom:.25rem!important}.ml-xl-1,.mx-xl-1{margin-left:.25rem!important}.m-xl-2{margin:.5rem!important}.mt-xl-2,.my-xl-2{margin-top:.5rem!important}.mr-xl-2,.mx-xl-2{margin-right:.5rem!important}.mb-xl-2,.my-xl-2{margin-bottom:.5rem!important}.ml-xl-2,.mx-xl-2{margin-left:.5rem!important}.m-xl-3{margin:1rem!important}.mt-xl-3,.my-xl-3{margin-top:1rem!important}.mr-xl-3,.mx-xl-3{margin-right:1rem!important}.mb-xl-3,.my-xl-3{margin-bottom:1rem!important}.ml-xl-3,.mx-xl-3{margin-left:1rem!important}.m-xl-4{margin:1.5rem!important}.mt-xl-4,.my-xl-4{margin-top:1.5rem!important}.mr-xl-4,.mx-xl-4{margin-right:1.5rem!important}.mb-xl-4,.my-xl-4{margin-bottom:1.5rem!important}.ml-xl-4,.mx-xl-4{margin-left:1.5rem!important}.m-xl-5{margin:3rem!important}.mt-xl-5,.my-xl-5{margin-top:3rem!important}.mr-xl-5,.mx-xl-5{margin-right:3rem!important}.mb-xl-5,.my-xl-5{margin-bottom:3rem!important}.ml-xl-5,.mx-xl-5{margin-left:3rem!important}.p-xl-0{padding:0!important}.pt-xl-0,.py-xl-0{padding-top:0!important}.pr-xl-0,.px-xl-0{padding-right:0!important}.pb-xl-0,.py-xl-0{padding-bottom:0!important}.pl-xl-0,.px-xl-0{padding-left:0!important}.p-xl-1{padding:.25rem!important}.pt-xl-1,.py-xl-1{padding-top:.25rem!important}.pr-xl-1,.px-xl-1{padding-right:.25rem!important}.pb-xl-1,.py-xl-1{padding-bottom:.25rem!important}.pl-xl-1,.px-xl-1{padding-left:.25rem!important}.p-xl-2{padding:.5rem!important}.pt-xl-2,.py-xl-2{padding-top:.5rem!important}.pr-xl-2,.px-xl-2{padding-right:.5rem!important}.pb-xl-2,.py-xl-2{padding-bottom:.5rem!important}.pl-xl-2,.px-xl-2{padding-left:.5rem!important}.p-xl-3{padding:1rem!important}.pt-xl-3,.py-xl-3{padding-top:1rem!important}.pr-xl-3,.px-xl-3{padding-right:1rem!important}.pb-xl-3,.py-xl-3{padding-bottom:1rem!important}.pl-xl-3,.px-xl-3{padding-left:1rem!important}.p-xl-4{padding:1.5rem!important}.pt-xl-4,.py-xl-4{padding-top:1.5rem!important}.pr-xl-4,.px-xl-4{padding-right:1.5rem!important}.pb-xl-4,.py-xl-4{padding-bottom:1.5rem!important}.pl-xl-4,.px-xl-4{padding-left:1.5rem!important}.p-xl-5{padding:3rem!important}.pt-xl-5,.py-xl-5{padding-top:3rem!important}.pr-xl-5,.px-xl-5{padding-right:3rem!important}.pb-xl-5,.py-xl-5{padding-bottom:3rem!important}.pl-xl-5,.px-xl-5{padding-left:3rem!important}.m-xl-auto{margin:auto!important}.mt-xl-auto,.my-xl-auto{margin-top:auto!important}.mr-xl-auto,.mx-xl-auto{margin-right:auto!important}.mb-xl-auto,.my-xl-auto{margin-bottom:auto!important}.ml-xl-auto,.mx-xl-auto{margin-left:auto!important}}.text-justify{text-align:justify!important}.text-nowrap{white-space:nowrap!important}.text-truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.text-left{text-align:left!important}.text-right{text-align:right!important}.text-center{text-align:center!important}@media (min-width:576px){.text-sm-left{text-align:left!important}.text-sm-right{text-align:right!important}.text-sm-center{text-align:center!important}}@media (min-width:768px){.text-md-left{text-align:left!important}.text-md-right{text-align:right!important}.text-md-center{text-align:center!important}}@media (min-width:992px){.text-lg-left{text-align:left!important}.text-lg-right{text-align:right!important}.text-lg-center{text-align:center!important}}@media (min-width:1200px){.text-xl-left{text-align:left!important}.text-xl-right{text-align:right!important}.text-xl-center{text-align:center!important}}.text-lowercase{text-transform:lowercase!important}.text-uppercase{text-transform:uppercase!important}.text-capitalize{text-transform:capitalize!important}.font-weight-light{font-weight:300!important}.font-weight-normal{font-weight:400!important}.font-weight-bold{font-weight:700!important}.font-italic{font-style:italic!important}.text-white{color:#fff!important}.text-primary{color:#007bff!important}a.text-primary:focus,a.text-primary:hover{color:#0062cc!important}.text-secondary{color:#6c757d!important}a.text-secondary:focus,a.text-secondary:hover{color:#545b62!important}.text-success{color:#28a745!important}a.text-success:focus,a.text-success:hover{color:#1e7e34!important}.text-info{color:#17a2b8!important}a.text-info:focus,a.text-info:hover{color:#117a8b!important}.text-warning{color:#ffc107!important}a.text-warning:focus,a.text-warning:hover{color:#d39e00!important}.text-danger{color:#dc3545!important}a.text-danger:focus,a.text-danger:hover{color:#bd2130!important}.text-light{color:#f8f9fa!important}a.text-light:focus,a.text-light:hover{color:#dae0e5!important}.text-dark{color:#343a40!important}a.text-dark:focus,a.text-dark:hover{color:#1d2124!important}.text-muted{color:#6c757d!important}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.visible{visibility:visible!important}.invisible{visibility:hidden!important}@media print{*,:after,:before{text-shadow:none!important;-webkit-box-shadow:none!important;box-shadow:none!important}a:not(.btn){text-decoration:underline}abbr[title]:after{content:" (" attr(title) ")"}pre{white-space:pre-wrap!important}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}@page{size:a3}.container,body{min-width:992px!important}.navbar{display:none}.badge{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}.navbar-laravel{background-color:#fff;-webkit-box-shadow:0 2px 4px rgba(0,0,0,.04);box-shadow:0 2px 4px rgba(0,0,0,.04)} \ No newline at end of file diff --git a/public/home.html b/public/home.html index c13d4ba..99888ce 100644 --- a/public/home.html +++ b/public/home.html @@ -261,39 +261,37 @@ -

Fedrick Darel Auditore

+

Asif Ferdous

Importer

-
+
Personal Information
-
+
Edit
+
- +
- +
- +
- -
-
- +
@@ -322,9 +320,9 @@
  • Home
    • -
  • - Notice -
    • + + +
  • Arrangement
    • -
  • - Messenger -
    • + + +
  • Track Order
    • -
  • - Example Element - -
    • + + + + + + + + +
    @@ -412,7 +410,7 @@
    - Add New SO + New Shipping Order
    @@ -611,7 +609,7 @@ -

    Fedrick Darel Auditore

    +

    Asif ferdous

    Importer

    @@ -635,11 +633,27 @@ -
    + + + + + + + + +
    - +
    - Branch Information + Delivery Information +
    +     +
    +
    + + +
    + Personal Information
    @@ -655,27 +669,27 @@
    -
    - - -
    - Delivery Information -
    -     -
    + + + + + + + + -
    + - -
    - - -
    - Staff
    Information -
    -     -
    + + + + + + + + +
    @@ -686,14 +700,14 @@
    -
    - - -
    - Personal Information -
    -     -
    + + + + + + + +
    @@ -710,6 +724,65 @@
    + + + + +