Torkel Ödegaard b0fe69822a Merge branch 'master' into alerting ...

Conflicts:
	public/app/core/services/alert_srv.ts
	public/app/partials/confirm_modal.html

2016-07-18 18:22:35 +02:00

..

core

Merge branch 'master' into alerting

2016-07-18 18:22:35 +02:00

features

Merge branch 'master' into alerting

2016-07-18 18:22:35 +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 'master' into alerting

2016-07-18 18:22:35 +02:00

plugins

Merge branch 'master' into alerting

2016-07-18 18:22:35 +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