]> git.ipfire.org Git - thirdparty/asterisk.git/commit
res_http_media_cache.c: Fix merge errors from 18 -> master
authorSean Bright <sean.bright@gmail.com>
Fri, 2 Jul 2021 15:15:05 +0000 (11:15 -0400)
committerGeorge Joseph <gjoseph@digium.com>
Mon, 19 Jul 2021 17:38:25 +0000 (12:38 -0500)
commitd5bb27a06f9616a12281ceaa20b4a4319197cf14
treef064a01792a7c47765640824ac0c9b3049a0869d
parent237285a9a8dafbf5fbf16e4d59e8fb7f689188e8
res_http_media_cache.c: Fix merge errors from 18 -> master

ASTERISK-27871 #close

Change-Id: I6624f2d3a57f76a89bb372ef54a124929a0338d7
res/res_http_media_cache.c
tests/test_http_media_cache.c