Skip to content

Commit

Permalink
Merge branch 'develop' into feature/updated-badge-for-documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
tmcgee committed Mar 4, 2017
2 parents c255512 + db4c4d9 commit 212e948
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# CMV - The Configurable Map Viewer

[![Read The Docs](https://img.shields.io/badge/docs-2.0.0--beta.1-brightgreen.svg?style=flat)](http://docs.cmv.io/) [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/cmv/cmv-app?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](http://travis-ci.org/cmv/cmv-app.svg?branch=master)](http://travis-ci.org/cmv/cmv-app)
[![Greenkeeper badge](https://badges.greenkeeper.io/cmv/cmv-app.svg)](https://greenkeeper.io/)

[![Read The Docs](https://img.shields.io/badge/docs-1.3.4-brightgreen.svg?style=flat)](http://docs.cmv.io/) [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/cmv/cmv-app?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](http://travis-ci.org/cmv/cmv-app.svg?branch=master)](http://travis-ci.org/cmv/cmv-app)

## Introduction
[CMV](http://cmv.io/) is a community-supported open source mapping framework. CMV works with the [Esri JavaScript API](http://developers.arcgis.com/javascript/jsapi/3/), [ArcGIS Server](https://www.esri.com/software/arcgis/arcgisserver), [ArcGIS Online](https://arcgis.com/) and more.
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@
"dependencies": {
"babel-eslint": "~7.1.1",
"csslint": "1.0.x",
"eslint": "3.5.x",
"eslint": "~3.17.0",
"grunt": "1.0.x",
"grunt-contrib-clean": "1.0.x",
"grunt-contrib-compress": "~1.4.1",
"grunt-contrib-connect": "1.0.x",
"grunt-contrib-copy": "1.0.x",
"grunt-contrib-csslint": "~2.0.x",
"grunt-contrib-cssmin": "1.0.x",
"grunt-contrib-uglify": "2.1.x",
"grunt-contrib-cssmin": "~2.0.0",
"grunt-contrib-uglify": "~2.2.0",
"grunt-contrib-watch": "1.0.x",
"grunt-eslint": "19.0.x",
"grunt-newer": "1.2.x",
"grunt-open": "0.2.x",
"grunt-postcss": "0.8.x",
"body-parser": "1.16.x",
"body-parser": "~1.17.0",
"proxypage": "*"
},
"engine": "node >= 4",
Expand Down

0 comments on commit 212e948

Please sign in to comment.