Commit 0ac2ec7
committed
Merge commit '6097e82194772847954dc2c2b7559543cc7531cc' into add-page-localization
* commit '6097e82194772847954dc2c2b7559543cc7531cc':
fix: upgrade mime from 2.4.7 to 2.5.0 (parse-community#7166)
fix: upgrade pg-promise from 10.8.7 to 10.9.0 (parse-community#7168)
fix: upgrade apollo-server-express from 2.19.1 to 2.19.2 (parse-community#7165)
Upgrade @node-rs/bcrypt to latest version (parse-community#7159)
Run Prettier after Definitions (parse-community#7164)
# Conflicts:
# package-lock.json2 files changed
+113
-34
lines changedSome generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | | - | |
| 30 | + | |
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
48 | | - | |
| 48 | + | |
49 | 49 | | |
50 | 50 | | |
51 | 51 | | |
52 | | - | |
| 52 | + | |
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
| |||
94 | 94 | | |
95 | 95 | | |
96 | 96 | | |
97 | | - | |
| 97 | + | |
98 | 98 | | |
99 | 99 | | |
100 | 100 | | |
| |||
117 | 117 | | |
118 | 118 | | |
119 | 119 | | |
120 | | - | |
| 120 | + | |
121 | 121 | | |
122 | 122 | | |
123 | 123 | | |
| |||
0 commit comments