Richard Mudgett 4b18b3bb4d Fix 'alembic branches' merge conflict as described by the web page. ...

........

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

2014-03-26 16:05:00 +00:00

..

versions

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

2014-03-26 16:05:00 +00:00

env.py

alembic: Add svn:ignore *.pyc to directories and svn:executable to *.py files.

2014-02-18 19:19:37 +00:00

script.py.mako

…