Code

chore: fix merge conflicts#1851

Code

Merged

profnandaa merged 11 commits intomastervalidatorjs/validator.js:masterfrom chore/fix-merge-conflictsvalidatorjs/validator.js:chore/fix-merge-conflictsCopy head branch name to clipboardOct 31, 2021

+213-1

Commits

Commits on Oct 31, 2021

• feat(isMobilePhone): regex for Burkina Faso fr-BF and Namibia en-NA locales

  Show description for 5c2d69e
  

  ZeeMangena

  authored and

  profnandaa

  committed
  5c2d69e

• feat(isMobilePhone): add Maldives dv-MV locale

  Show description for c96d805
  

  Prajwalrajbasnet

  authored and

  profnandaa

  committed
  c96d805

• feat(isMobilePhone): add Tajikistan tg-TJ locale (#1846)

  

  mgnss

  authored and

  profnandaa

  committed
  ed60123

• feat(isMobilePhone): add Kiribati en-KI locale

  Show description for 8627e48
  

  c-tanner

  authored and

  profnandaa

  committed
  8627e48

• feat(isMobilePhone): add Frech Polynesia fr-PF locale

  Show description for f7ff349
  

  hereje

  authored and

  profnandaa

  committed
  f7ff349

• feat(isMobilePhone): add Guyana en-GY locale

  Show description for 0e5d5d4
  

  mfkrause

  authored and

  profnandaa

  committed
  0e5d5d4

• feat(isMobilePhone): add Turkmenistan tk-TM

  Show description for 26605f9
  

  husan-eshonqulov

  authored and

  profnandaa

  committed
  26605f9

• feat(isMobilePhone): add Botswana en-BW locale

  Show description for a3faa83
  

  mgndolan

  authored and

  profnandaa

  committed
  a3faa83

• feat(isMobilePhone): add Palestine ar-PS locale

  Show description for 5b06703
  

  brendan-c

  authored and

  profnandaa

  committed
  5b06703

• feat(isMobilePhone): add El Salvador es-SV locale

  Show description for f17e220
  

  hereje

  authored and

  profnandaa

  committed
  f17e220

• chore: merge conflict clean-up

  profnandaa

  committed
  83cb7f8