Torkel Ödegaard ee0e4d2b69 Merge branch 'master' into external-plugins ... Conflicts: public/app/plugins/panels/table/editor.ts public/views/index.html		2015-12-02 18:30:48 +01:00
..
core	Merge branch 'master' into external-plugins	2015-12-02 18:30:48 +01:00
features	Merge branch 'master' into external-plugins	2015-12-02 18:30:48 +01:00
headers	refactoring: more moving stuff around	2015-10-30 14:44:40 +01:00
partials	fix(inspector): added close button to inspector modal, fixes #3213	2015-11-13 09:36:52 +01:00
plugins	Merge branch 'master' into external-plugins	2015-12-02 18:30:48 +01:00
app.js	feat(external_plugin): lots of refactoring for side menu link extensions and view data, #3185	2015-11-20 09:43:10 +01:00
require_config.js	feat(external plugins): worked on supporting external plugins better	2015-11-19 18:44:07 +01:00