Torkel Ödegaard 201f50b121 Merge branch 'master' into external-plugins ... Conflicts: pkg/api/login.go public/app/core/routes/all.js public/app/core/table_model.ts public/app/panels/table/table_model.ts public/app/plugins/panels/table/editor.ts public/app/plugins/panels/table/table_model.ts		2015-12-14 17:28:57 +01:00
..
all.js	Merge branch 'master' into external-plugins	2015-12-14 17:28:57 +01:00
bundle_loader.ts	refactor: moving routes into core, improved bundle loader	2015-09-15 08:53:06 +02:00
dashboard_loaders.js	change(dashboards): made home dashboard and json file dashboards editable unless otherwise specified in json file, closes #2567	2015-10-26 18:54:32 +01:00