Torkel Ödegaard 9266d3789b Merge remote-tracking branch 'origin/kariosdb' ... Conflicts: public/test/test-main.js		2015-06-25 18:34:41 +02:00
..
app	Merge remote-tracking branch 'origin/kariosdb'	2015-06-25 18:34:41 +02:00
css/less	Fixed issue with multi select template variable and restoring state from url, #2196	2015-06-19 15:10:34 -04:00
dashboards	Removed invalid scripted dashboard example, Closes #2063	2015-05-28 11:41:32 +02:00
emails	Added support for templated email subjects	2015-06-14 06:07:36 +02:00
fonts	Renamed src directory to public	2015-03-29 12:57:28 +02:00
img	work on variable multi select	2015-06-03 14:53:52 +02:00
test	Merge remote-tracking branch 'origin/kariosdb'	2015-06-25 18:34:41 +02:00
vendor	Moved requirejs to bower, #677	2015-06-13 23:01:54 +02:00
views	Moved requirejs to bower, #677	2015-06-13 23:01:54 +02:00
robots.txt	add support for robots.txt file	2015-06-15 19:02:38 -04:00