Merge branch 'master' of github.com:grafana/grafana

This commit is contained in:
Torkel Ödegaard 2014-08-11 13:44:11 +02:00
commit fdbdebac32
2 changed files with 3 additions and 1 deletions

View File

@ -1,6 +1,8 @@
language: node_js language: node_js
node_js: node_js:
- "0.10" - "0.10"
git:
depth: 1
before_script: before_script:
- npm install -g grunt-cli - npm install -g grunt-cli
after_script: after_script:

View File

@ -1,4 +1,4 @@
[Grafana](http://grafana.org) [![Build Status](https://api.travis-ci.org/grafana/grafana.png)](https://travis-ci.org/grafana/grafana) [![Coverage Status](https://coveralls.io/repos/grafana/grafana/badge.png?branch=develop)](https://coveralls.io/r/grafana/grafana?branch=develop) [Grafana](http://grafana.org) [![Build Status](https://api.travis-ci.org/grafana/grafana.svg)](https://travis-ci.org/grafana/grafana) [![Coverage Status](https://coveralls.io/repos/grafana/grafana/badge.png?branch=develop)](https://coveralls.io/r/grafana/grafana?branch=develop)
================ ================
[Website](http://grafana.org) | [Website](http://grafana.org) |
[Twitter](http://twitter.com/grafana) | [Twitter](http://twitter.com/grafana) |