diff options
author | Erlang/OTP <[email protected]> | 2018-04-18 11:58:42 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2018-04-18 11:58:42 +0200 |
commit | 18d6cb9636ecd15099575710d5c5697875cd38b8 (patch) | |
tree | 5c638b6806378addfc150825fb29b1e8e90c76b7 /lib/kernel/src/file_server.erl | |
parent | c5ee502e6031986983d3596745cad7fd547fd9c2 (diff) | |
parent | 296a3caf53ca5ec8ca44c572c773b1352e668071 (diff) | |
download | otp-18d6cb9636ecd15099575710d5c5697875cd38b8.tar.gz otp-18d6cb9636ecd15099575710d5c5697875cd38b8.tar.bz2 otp-18d6cb9636ecd15099575710d5c5697875cd38b8.zip |
Merge branch 'siri/systools/make_hybrid_boot/OTP-15017' into maint-20
* siri/systools/make_hybrid_boot/OTP-15017:
Update appup file for sasl
Fix bug in hybrid boot file used for restart_new_emulator
Diffstat (limited to 'lib/kernel/src/file_server.erl')
0 files changed, 0 insertions, 0 deletions