aboutsummaryrefslogtreecommitdiffstats
path: root/LICENSE
diff options
context:
space:
mode:
authorBrandon Millman <brandon.millman@gmail.com>2018-11-20 01:32:39 +0800
committerBrandon Millman <brandon.millman@gmail.com>2018-11-20 01:32:39 +0800
commit3d6711bd38c3cb801d00a73a6386c4bb16359811 (patch)
tree411ffc816f673c69d50fcf0a9f0ae3c4defa4ea9 /LICENSE
parent004e197863e4df942d21f9e4ed629c08eeadad56 (diff)
parent99541f89f7676f6b0d8a923ad377fa901a74f504 (diff)
downloaddexon-sol-tools-3d6711bd38c3cb801d00a73a6386c4bb16359811.tar
dexon-sol-tools-3d6711bd38c3cb801d00a73a6386c4bb16359811.tar.gz
dexon-sol-tools-3d6711bd38c3cb801d00a73a6386c4bb16359811.tar.bz2
dexon-sol-tools-3d6711bd38c3cb801d00a73a6386c4bb16359811.tar.lz
dexon-sol-tools-3d6711bd38c3cb801d00a73a6386c4bb16359811.tar.xz
dexon-sol-tools-3d6711bd38c3cb801d00a73a6386c4bb16359811.tar.zst
dexon-sol-tools-3d6711bd38c3cb801d00a73a6386c4bb16359811.zip
Merge branch 'development' into feature/instant/icons
* development: (37 commits) Add 0x-order-utils.py library to developers home Fixes to CONTRIBUTING.md Improve our CONTRIBUTING.md instructions fix(order_utils.py): publish docs to S3, not RTD (#1264) fix: make instant package private feat: refer to map file in postpublish configs feat: add new bundle name to bundle watch fix: tslint ignore rule in wrong place Update blog post feature Fix disclaimer on mobile Add smart contract docs to Developer Home Add Apache license link Fix capitalization in title Remove excess semi-colon Point directly to README for docs link Update icons Update LICENSE Fix disclaimer Add blogpost URL Add disclaimer ...
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE4
1 files changed, 2 insertions, 2 deletions
diff --git a/LICENSE b/LICENSE
index 9096fefaa..0e931d04d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2017 ZeroEx Inc.
+Copyright 2017 ZeroEx Intl.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -10,4 +10,4 @@ Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
-limitations under the License. \ No newline at end of file
+limitations under the License.