kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix 'alembic branches' merge conflict as described by the web page.

Browse Source 
........

Merged revisions 411191 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@411192 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2014-03-26 16:05:00 +00:00
parent c32fe8b8e5
commit 4b18b3bb4d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py
View File

@@ -1,7 +1,7 @@
"""Fix tos and cos field types
Revision ID: 4c573e7135bd
Revises: 21e526ad3040
Revises: 28887f25a46f
Create Date: 2014-03-05 12:16:56.618630
"""