]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
projects / thirdparty / asterisk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 80a8b2a 4ec85a9)
Merge "voicemail: Move app_voicemail / res_mwi_external conflict to runtime" into 13
authorJoshua Colp <jcolp@digium.com>
Tue, 5 Jan 2016 11:56:04 +0000 (05:56 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 5 Jan 2016 11:56:04 +0000 (05:56 -0600)

Trivial merge
Mirror of https://github.com/asterisk/asterisk.git