Merge remote-tracking branch 'origin/master'

Browse Source

Conflicts:
	src/css/bootstrap.dark.min.css
	src/css/bootstrap.light.min.css
	src/css/less/grafana.less
	src/css/less/variables.dark.less
	src/css/less/variables.light.less

...

This commit is contained in:

Torkel Ödegaard

2014-02-14 07:45:23 +01:00

parent 2c414d8e45 cac70a10fe

commit 75e493363d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available