Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: get travis to pass #7325

Merged
merged 11 commits into from
Sep 4, 2020
Merged

chore: get travis to pass #7325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e0fde43
Update base.txt
thelostone-mc Sep 3, 2020
8c00f6b
Update base.txt
thelostone-mc Sep 3, 2020
c2545c2
Merge branch 'master' into thelostone-mc-patch-2
thelostone-mc Sep 3, 2020
5ce3c2a
Update base.txt
thelostone-mc Sep 3, 2020
6dfb14d
Update base.txt
thelostone-mc Sep 3, 2020
3288546
Update base.txt
thelostone-mc Sep 3, 2020
37aa296
Update base.txt
thelostone-mc Sep 3, 2020
a71f6b3
Merge branch 'master' into thelostone-mc-patch-2
thelostone-mc Sep 3, 2020
43b4439
Merge branch 'master' into thelostone-mc-patch-2
thelostone-mc Sep 4, 2020
f85ad25
Update base.txt
thelostone-mc Sep 4, 2020
80c986a
Update docker-compose.yml
thelostone-mc Sep 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ services:


ipfs:
image: ipfs/go-ipfs:release
image: ipfs/go-ipfs:v0.6.0
restart: unless-stopped
volumes:
- 'ipfsexport:/export'
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ cytoolz==0.9.0
boto==2.49.0
google-api-python-client
django-environ==0.4.5
ipfshttpclient
ipfshttpclient==0.6.0
eth-utils==1.4.1
jsondiff==1.1.1
social-auth-app-django==3.1.0
Expand Down