Torkel Ödegaard f9b628ad0e Merge branch 'v3.1.x' ...

Conflicts:
	conf/defaults.ini
	conf/sample.ini
	pkg/metrics/graphite.go
	pkg/metrics/graphite_test.go

2016-08-17 09:53:46 +02:00

..

core

Merge branch 'v3.1.x'

2016-08-17 09:53:46 +02:00

features

Merge branch 'v3.1.x'

2016-08-14 14:47:14 +02:00

headers

tech(): put in a real event emitter instead of rxjs based on that was broken

2016-04-07 19:47:48 -04:00

partials

Merge branch 'v3.1.x'

2016-07-12 15:54:31 +02:00

plugins

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

2016-08-17 09:42:52 +02:00

app.ts

refactor(): refactored date handling and locale handling in #5517

2016-07-05 17:59:43 +02:00

boot.js

fix(build): fixed minor issue in systemjs builder, and added SystemJs cache buster

2016-02-10 06:50:17 +01:00

system.conf.js

Revert "Revert "Gauges""

2016-04-22 14:55:35 +02:00