Browse Source

Merge remote-tracking branch 'origin/dev' into dev

Arnaud Vergnet 1 year ago
parent
commit
5cdf9d6318
2 changed files with 2 additions and 17 deletions
  1. 2
    2
      ios/Campus.xcodeproj/project.pbxproj
  2. 0
    15
      package-lock.json

+ 2
- 2
ios/Campus.xcodeproj/project.pbxproj View File

@@ -318,7 +318,7 @@
318 318
 				DEVELOPMENT_TEAM = 6JA7CLNUV6;
319 319
 				INFOPLIST_FILE = Campus/Info.plist;
320 320
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
321
-				MARKETING_VERSION = 4.0.0;
321
+				MARKETING_VERSION = 4.0.1;
322 322
 				OTHER_LDFLAGS = (
323 323
 					"$(inherited)",
324 324
 					"-ObjC",
@@ -343,7 +343,7 @@
343 343
 				DEVELOPMENT_TEAM = 6JA7CLNUV6;
344 344
 				INFOPLIST_FILE = Campus/Info.plist;
345 345
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
346
-				MARKETING_VERSION = 4.0.0;
346
+				MARKETING_VERSION = 4.0.1;
347 347
 				OTHER_LDFLAGS = (
348 348
 					"$(inherited)",
349 349
 					"-ObjC",

+ 0
- 15
package-lock.json View File

@@ -4443,15 +4443,6 @@
4443 4443
         }
4444 4444
       }
4445 4445
     },
4446
-    "eslint-plugin-babel": {
4447
-      "version": "5.3.1",
4448
-      "resolved": "https://registry.npmjs.org/eslint-plugin-babel/-/eslint-plugin-babel-5.3.1.tgz",
4449
-      "integrity": "sha512-VsQEr6NH3dj664+EyxJwO4FCYm/00JhYb3Sk3ft8o+fpKuIfQ9TaW6uVUfvwMXHcf/lsnRIoyFPsLMyiWCSL/g==",
4450
-      "dev": true,
4451
-      "requires": {
4452
-        "eslint-rule-composer": "^0.3.0"
4453
-      }
4454
-    },
4455 4446
     "eslint-plugin-flowtype": {
4456 4447
       "version": "5.2.0",
4457 4448
       "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.2.0.tgz",
@@ -4628,12 +4619,6 @@
4628 4619
       "integrity": "sha512-YKBY+kilK5wrwIdQnCF395Ya6nDro3EAMoe+2xFkmyklyhF16fH83TrQOo9zbZIDxBsXFgBbywta/0JKRNFDkw==",
4629 4620
       "dev": true
4630 4621
     },
4631
-    "eslint-rule-composer": {
4632
-      "version": "0.3.0",
4633
-      "resolved": "https://registry.npmjs.org/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz",
4634
-      "integrity": "sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==",
4635
-      "dev": true
4636
-    },
4637 4622
     "eslint-scope": {
4638 4623
       "version": "5.1.0",
4639 4624
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz",

Loading…
Cancel
Save