Skip to content

Commit cc23a7b

Browse files
author
nlg
committed
Merge branch 'master' into stage
# Conflicts: # package-lock.json # package.json # src/entities/application.entity.ts # src/entities/enum/error-codes.enum.ts # src/modules/app.module.ts # src/modules/shared.module.ts # src/services/device-management/application.service.ts
2 parents 2a974da + 12485b4 commit cc23a7b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

.github/dependabot.yml.disable

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Please see the documentation for all configuration options:
44
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
55

6-
version: 2
6+
version: 3
77
updates:
88
- package-ecosystem: "npm" # See documentation for possible values
99
directory: "/" # Location of package manifests

0 commit comments

Comments
 (0)