Skip to content

Commit 516d2a1

Browse files
elpielelpiel
authored
Merge pull request #183 from AdExNetwork/dev
Merge `dev` into `master`
2 parents 17acadd + 6f0d7fd commit 516d2a1

File tree

133 files changed

+7088
-5518
lines changed

Some content is hidden

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

133 files changed

+7088
-5518
lines changed

‎.DS_Store

6 KB
Binary file not shown.

‎.env.dist

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

‎.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
target
22
**/*.rs.bk
3-
.env
3+
.env
4+
*.iml
5+
.idea
6+
.old

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "lib/protocol-eth"]
2+
path = lib/protocol-eth
3+
url = https://github.com/AdExNetwork/adex-protocol-eth

‎.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
language: rust
22
rust:
3-
- nightly-2019-05-08
3+
- nightly-2019-10-14
44
cache: cargo
55
env:
66
global:
77
- CARGO_MAKE_RUN_CHECK_FORMAT="true"
88
- CARGO_MAKE_RUN_CLIPPY="true"
9+
services:
10+
- redis-server
911
matrix:
1012
fast_finish: true
1113
script:

0 commit comments

Comments
 (0)