oscarleiva/energylink

Torkel Ödegaard 457ae74343 Merge branch 'or_alerting' of https://github.com/utkarshcmu/grafana into utkarshcmu-or_alerting		%!s(int64=9) %!d(string=hai) anos
..
index.md	a100836bb4 docs(): Added pages for alerting docs, added keyboard shortcuts doc article, #6490	%!s(int64=9) %!d(string=hai) anos
notifications.md	e12a4f6b46 docs(notifications): fixes typo	%!s(int64=9) %!d(string=hai) anos
rules.md	f46c4c88ca Added OR condition in docs	%!s(int64=9) %!d(string=hai) anos