summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorMark Michelson <mmichelson@digium.com>2010-07-08 22:16:16 +0000
committerMark Michelson <mmichelson@digium.com>2010-07-08 22:16:16 +0000
commit9bd88923f6379d47f9188994e9203f9982177756 (patch)
treec05335b563c3f7cb9a3edbf3e101d8e1b80e0be4 /addons
parentf565ab807113b610625f01f2685c572e7bce13fb (diff)
And the automerge property.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@274786 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'addons')
0 files changed, 0 insertions, 0 deletions