Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge remote-tracking branch 'origin/master' into black
Conflicts:
	setup.py
  • Loading branch information
kkroening committed Jun 10, 2019
commit fff79e6b9358e6903db3c0f830d0c9a04a612dd0
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from setuptools import setup
from textwrap import dedent

version = '0.1.17'
version = '0.1.18'
download_url = 'https://github.com/kkroening/ffmpeg-python/archive/v{}.zip'.format(
version
)
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.