Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
np1 committed Jan 13, 2015
2 parents 0b65fba + a28681c commit 71f976b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ Features
- Works with age-restricted videos and non-embeddable videos
- Small, standalone, single importable module file (pafy.py)
- Select highest quality stream for download or streaming
- Download video only (no audio) in m4v or webm format
- Download audio only (no video) in ogg or m4a format
- Download video only (no audio) in m4v format
- Retreive playlists and playlist metadata
- Works with Python 2.6+ and 3.3+
- No dependencies
Expand Down

0 comments on commit 71f976b

Please sign in to comment.