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
..
500.html	Renamed src directory to public	2015-03-29 12:57:28 +02:00
index.html	Merge branch 'master' into external-plugins	2015-12-02 18:30:48 +01:00