viewStateSrv.js
6.13 KB
-
Merge branch 'master' into alerting · b0fe6982
Conflicts: public/app/core/services/alert_srv.ts public/app/partials/confirm_modal.html
Torkel Ödegaard committed
Conflicts: public/app/core/services/alert_srv.ts public/app/partials/confirm_modal.html