settings.js
439 Bytes
-
Merge branch 'master' into external-plugins · ee0e4d2b
Conflicts: public/app/plugins/panels/table/editor.ts public/views/index.html
Torkel Ödegaard committed
Conflicts: public/app/plugins/panels/table/editor.ts public/views/index.html