aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded/src
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2017-10-02 10:43:20 +0200
committerRickard Green <[email protected]>2017-10-02 10:43:20 +0200
commitd8fc2c8c1b0424ee42b1ddc8aef63056bc9e85fb (patch)
treec17a33e5956f9fbd630f7387f432a5aaf92d5e8f /erts/preloaded/src
parent9033a41375f3a31a18eb0cba3ea0dc84efbc0aa0 (diff)
parent0717a2194e863f3a78595184ccc5637697f03353 (diff)
downloadotp-d8fc2c8c1b0424ee42b1ddc8aef63056bc9e85fb.tar.gz
otp-d8fc2c8c1b0424ee42b1ddc8aef63056bc9e85fb.tar.bz2
otp-d8fc2c8c1b0424ee42b1ddc8aef63056bc9e85fb.zip
Merge branch 'maint'
* maint: Don't allow null in filenames
Diffstat (limited to 'erts/preloaded/src')
-rw-r--r--erts/preloaded/src/erts.app.src2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/preloaded/src/erts.app.src b/erts/preloaded/src/erts.app.src
index 7ab06164b4..beb29a7c89 100644
--- a/erts/preloaded/src/erts.app.src
+++ b/erts/preloaded/src/erts.app.src
@@ -37,7 +37,7 @@
{registered, []},
{applications, []},
{env, []},
- {runtime_dependencies, ["stdlib-3.0", "kernel-5.0", "sasl-3.0.1"]}
+ {runtime_dependencies, ["stdlib-3.4.3", "kernel-5.4.1", "sasl-3.0.1"]}
]}.
%% vim: ft=erlang