← Back to branch summary

~davidc3/ubuntu-rest-scopes/testing-newyorktimes

~davidc3/ubuntu-rest-scopes/testing-newyorktimes

Viewing all changes in revision 17.

Committer: David Callé
Date: 2014-03-04 12:09:51 UTC
mfrom: (3.1.57 ubuntu-rest-scopes)
Revision ID: davidc@framli.eu-20140304120951-m4a5xynsmclvdq73

Merge trunk, fix conflicts

files added:
src/scopes/reddit.py

src/scopes/tests/fixtures/reddit-front.json

src/scopes/tests/fixtures/reddit-subreddit.json

src/scopes/tests/test_reddit.py

files modified:
configs/dev-secrets.yaml

configs/scopes-info.yaml

src/rest_scopes.py

src/scopes/__init__.py

src/scopes/amazon.py

src/scopes/tests/test_amazon.py

src/scopes/tests/test_base.py

src/tests/test_rest_scopes.py

Show diffs side-by-side

added added

removed removed

configs/dev-secrets.yaml

configs/scopes-info.yaml

src/rest_scopes.py

src/scopes/__init__.py

src/scopes/amazon.py

src/scopes/reddit.py

src/scopes/tests/fixtures/reddit-front.json

src/scopes/tests/fixtures/reddit-subreddit.json

src/scopes/tests/test_amazon.py

src/scopes/tests/test_base.py

src/scopes/tests/test_reddit.py

src/tests/test_rest_scopes.py

Older »