Skip to content

Commit 712e939

Browse files
committed
Fixed merge conflicts.
2 parents 3b7a86c + 516bbb2 commit 712e939

File tree

10 files changed

+427
-214
lines changed

10 files changed

+427
-214
lines changed

.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@ python:
55
- 3.3
66
- 3.4
77
- 3.5
8+
before_install:
9+
- pip install coveralls
810
install:
911
- pip install -e .
1012
- pip install coverage
13+
1114
script: nosetests -w tests/unit --with-coverage --cover-package=quickbooks
15+
after_success:
16+
- coveralls

CHANGELOG.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
Changelog
22
========
33

4+
* 0.3.7 (February 10, 2016)
5+
* Added missing quickbook object Class
6+
7+
* 0.3.6 (February 3, 2016)
8+
* Fixed issues with README
9+
10+
* 0.3.5 (February 3, 2016)
11+
* Added MANIFEST.
12+
* Converted README to reStructureText.
13+
14+
* 0.3.4 (February 3, 2016)
15+
* Fixed issues with get_authorize_url.
16+
417
* 0.2.4 (Sept 13, 2015)
518
* Added paging support to "filter", "where", and "all" methods.

MANIFEST.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
include README.rst
2+
include LICENSE
3+
recursive-include tests *

README.md

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

0 commit comments

Comments
 (0)