Fabian Reinartz 9c83e815d1 Merge branch 'release-2.2' into update		2018-06-05 05:29:11 -04:00
..
css	Make show annotations checkbox match query history checkbox (#3936)	2018-03-09 14:39:28 +01:00
img	add favicon	2016-12-27 13:58:51 +01:00
js	Merge branch 'release-2.2' into update	2018-06-05 05:29:11 -04:00
vendor	Merge branch 'fix_web_ui_utc' of git://github.com/yamatoya/prometheus into yamatoya-fix_web_ui_utc	2017-09-18 12:07:52 +02:00