Skip to content

Commit aef10ad

Browse files
jkeyesjkeyes
committed
Merge branch 'apiv2' of github.com:jkeyes/python-intercom
2 parents 69c8989 + dacbc25 commit aef10ad

File tree

100 files changed

+4559
-2864
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+4559
-2864
lines changed

‎.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
language: python
22
python:
3-
- 2.6
43
- 2.7
4+
- 3.4
55
install:
66
- pip install -r requirements.txt --use-mirrors
77
- pip install -r dev-requirements.txt --use-mirrors
8-
script:
9-
- nosetests tests
8+
script:
9+
- nosetests tests/unit

‎CHANGES.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
Changelog
33
=========
44

5+
* 2.0.alpha
6+
* support for Intercom API v2
7+
* support for Python 3
58
* 0.2.13
69
* fix wildcard import from `intercom` `#28 https://github.com/jkeyes/python-intercom/pull/28`_. (https://github.com/marselester)
710
* 0.2.12

‎LICENSE.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
MIT License.
1+
MIT License
2+
===========
23

3-
See http://jkeyes.mit-license.org/
4+
See http://jkeyes.mit-license.org/ for specific license information.

0 commit comments

Comments
 (0)