Skip to content
This repository was archived by the owner on May 31, 2025. It is now read-only.

Commit b307b30

Browse files
authored
Merge branch 'master' into dependabot/pip/docs/jinja2-2.11.3
2 parents 3db32ac + eede56d commit b307b30

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

docs/content/management/divisions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Divisions
22

33
Divisions can be used in rCTF to segregate users into different scoreboards, with optional access control lists based on verified email addresses.
4-
Every user must be in exactly one division, although users can change their division at any time (provided the new divison satisifies the ACL).
4+
Every user must be in exactly one division, although users can change their division at any time (provided the new division satisfies the ACL).
55

66
* `divisions` is a map from a division ID to its human readable name shown in the UI.
77
* `defaultDivision` is the division ID that new users will be placed into.

yarn.lock

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2339,10 +2339,10 @@ blueimp-md5@^2.10.0:
23392339
resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.16.0.tgz#9018bb805e4ee05512e0e8cbdb9305eeecbdc87c"
23402340
integrity sha512-j4nzWIqEFpLSbdhUApHRGDwfXbV8ALhqOn+FY5L6XBdKPAXU9BpGgFSbDsgqogfqPPR9R2WooseWCsfhfEC6uQ==
23412341

2342-
bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0:
2343-
version "4.11.9"
2344-
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
2345-
integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
2342+
bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
2343+
version "4.12.0"
2344+
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
2345+
integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
23462346

23472347
bn.js@^5.1.1:
23482348
version "5.1.2"
@@ -2427,7 +2427,7 @@ braces@^3.0.1, braces@~3.0.2:
24272427
dependencies:
24282428
fill-range "^7.0.1"
24292429

2430-
brorand@^1.0.1:
2430+
brorand@^1.0.1, brorand@^1.1.0:
24312431
version "1.1.0"
24322432
resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
24332433
integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
@@ -4295,17 +4295,17 @@ electron-to-chromium@^1.3.413:
42954295
integrity sha512-q2PeCP2PQXSYadDo9uNY+uHXjdB9PcsUpCVoGlY8TZOPHGlXdevlqW9PkKeqCxn2QBkGB8b6AcMO++gh8X82bA==
42964296

42974297
elliptic@^6.0.0, elliptic@^6.5.2:
4298-
version "6.5.3"
4299-
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
4300-
integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
4298+
version "6.5.4"
4299+
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
4300+
integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
43014301
dependencies:
4302-
bn.js "^4.4.0"
4303-
brorand "^1.0.1"
4302+
bn.js "^4.11.9"
4303+
brorand "^1.1.0"
43044304
hash.js "^1.0.0"
4305-
hmac-drbg "^1.0.0"
4306-
inherits "^2.0.1"
4307-
minimalistic-assert "^1.0.0"
4308-
minimalistic-crypto-utils "^1.0.0"
4305+
hmac-drbg "^1.0.1"
4306+
inherits "^2.0.4"
4307+
minimalistic-assert "^1.0.1"
4308+
minimalistic-crypto-utils "^1.0.1"
43094309

43104310
email-validator@2.0.4:
43114311
version "2.0.4"
@@ -5956,7 +5956,7 @@ hex-color-regex@^1.1.0:
59565956
resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
59575957
integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
59585958

5959-
hmac-drbg@^1.0.0:
5959+
hmac-drbg@^1.0.1:
59605960
version "1.0.1"
59615961
resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
59625962
integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
@@ -7824,7 +7824,7 @@ minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
78247824
resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
78257825
integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
78267826

7827-
minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
7827+
minimalistic-crypto-utils@^1.0.1:
78287828
version "1.0.1"
78297829
resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
78307830
integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=

0 commit comments

Comments
 (0)