Merge branch 'master' into standalone-server
This commit is contained in:
commit
64e225c4aa
11
CONTRIBUTING.md
Normal file
11
CONTRIBUTING.md
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
Contributing
|
||||||
|
---
|
||||||
|
|
||||||
|
The issue tracker is at [github.com/CartoDB/Windshaft-cartodb](https://github.com/CartoDB/Windshaft-cartodb).
|
||||||
|
|
||||||
|
We love pull requests from everyone, see [Contributing to Open Source on GitHub](https://guides.github.com/activities/contributing-to-open-source/#contributing).
|
||||||
|
|
||||||
|
|
||||||
|
## Submitting Contributions
|
||||||
|
|
||||||
|
* You will need to sign a Contributor License Agreement (CLA) before making a submission. [Learn more here](https://cartodb.com/contributing).
|
2
LICENSE
2
LICENSE
@ -1,4 +1,4 @@
|
|||||||
Copyright (c) 2014, Vizzuality
|
Copyright (c) 2015, CartoDB
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
|
@ -95,3 +95,9 @@ Examples
|
|||||||
--------
|
--------
|
||||||
|
|
||||||
[CartoDB's Map Gallery](http://cartodb.com/gallery/) showcases several examples of visualisations built on top of this.
|
[CartoDB's Map Gallery](http://cartodb.com/gallery/) showcases several examples of visualisations built on top of this.
|
||||||
|
|
||||||
|
|
||||||
|
Contributing
|
||||||
|
---
|
||||||
|
|
||||||
|
See [CONTRIBUTING.md](CONTRIBUTING.md).
|
||||||
|
@ -1,4 +0,0 @@
|
|||||||
<Map
|
|
||||||
background-color="#c33"
|
|
||||||
srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
|
|
||||||
</Map>
|
|
Loading…
Reference in New Issue
Block a user