8000 Merge branch 'release-6x' of https://github.com/twilio/twilio-python … · saroshfarhan/twilio-python@e6cf719 · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit e6cf719

Browse files
jingmingjingming
committed
Merge branch 'release-6x' of https://github.com/twilio/twilio-python into addons
2 parents 0a3aa7d + 2d208b2 commit e6cf719

35 files changed

+1781
-2061
lines changed

‎CHANGES.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@ twilio-python Changelog
33

44
Here you can see the full list of changes between each twilio-python release.
55

6+
Version 6.0rc5
7+
-- 8000 -----------
8+
9+
Released May 27, 2016:
10+
11+
- Add wireless preview
12+
613
Version 6.0rc4
714
-------------
815

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ documentation.][documentation]
1212
Install from PyPi using [pip](http://www.pip-installer.org/en/latest/), a
1313
package manager for Python.
1414

15-
pip install twilio==6.0rc3
15+
pip install twilio==6.0rc4
1616

1717
Don't have pip installed? Try installing it, by running this from the command
1818
line:

‎tests/integration/conversations/v1/conversation/completed/__init__.py

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎tests/integration/conversations/v1/conversation/in_progress/__init__.py

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎tests/integration/conversations/v1/conversation/test_completed.py

Lines changed: 0 additions & 89 deletions
This file was deleted.

‎tests/integration/conversations/v1/conversation/test_in_progress.py

Lines changed: 0 additions & 89 deletions
This file was deleted.

‎tests/integration/conversations/v1/conversation/test_participant.py

Lines changed: 0 additions & 167 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0