kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-03 03:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,274 Commits 150 Branches 1,601 Tags
99701cd1d109a1ca41d79a20251bb40e4e9d3150
Commit Graph

1 Commits

Author SHA1 Message Date
Mark Michelson
f5e9cf5975 Add automerge property back after conflict. 
git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377879 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2012-12-11 21:52:09 +00:00