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
..
all.js	fix(search): remove old search ctrl	2016-01-26 23:28:06 +01:00
error_ctrl.js	angular2 test	2015-12-16 12:21:13 +01:00
inspect_ctrl.js	feat(inspector): fixed error handling, showing response body when data proxy returns text/html body	2016-08-16 22:31:26 +02:00
invited_ctrl.js	angular2 test	2015-12-16 12:21:13 +01:00
json_editor_ctrl.js	Viewers restricted to edit panel	2016-02-12 07:34:56 -08:00
login_ctrl.js	Merge branch 'v3.1.x'	2016-07-06 10:10:25 +02:00
reset_password_ctrl.js	angular2 test	2015-12-16 12:21:13 +01:00
signup_ctrl.ts	feat(tslint): added more tslint rules	2016-01-13 21:07:57 +01:00