[openstreetmap-carto] 02/05: Merge tag 'upstream/3.0.0'

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository openstreetmap-carto.

commit 78cf8ab217a3f823176d4348c952eae1bc9ceedd
Merge: 50d04da ad1be6d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Dec 22 19:09:23 2016 +0100

    Merge tag 'upstream/3.0.0'
    
    Upstream version 3.0.0

 .gitattributes                     |    1 -
 .travis.yml                        |   20 +-
 CHANGELOG.md                       |   15 +-
 CODE_OF_CONDUCT.md                 |    4 +-
 CONTRIBUTING.md                    |   39 +-
 INSTALL.md                         |   23 +-
 README.md                          |   22 +-
 amenity-points.mss                 |    6 +-
 get-shapefiles.sh                  |  101 -
 landcover.mss                      |   12 +-
 project.mml                        | 4659 ++++++++++++++++++++----------------
 project.yaml                       | 2520 -------------------
 scripts/get-shapefiles.py          |  387 +++
 scripts/travis_check_project_files |   15 -
 scripts/yaml2mml.py                |   36 -
 stations.mss                       |   11 +
 style.mss                          |   19 +-
 symbols/place/place-4-z7.svg       |   26 +-
 symbols/place/place-4.svg          |   26 +-
 symbols/place/place-6-z7.svg       |   27 +-
 symbols/place/place-6.svg          |   26 +-
 symbols/place/place-capital-6.svg  |   31 +-
 symbols/place/place-capital-8.svg  |   37 +-
 symbols/wilderness_hut.svg         |   37 +
 24 files changed, 3088 insertions(+), 5012 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-carto.git