Commit b8979a72 by Torkel Ödegaard

Merge branch 'docs-1.x' into develop

parents c1d7bef7 813b851c
......@@ -31,9 +31,10 @@ It also gives us the option to relicense the code with a more permissive license
If you have more questions, shoot us an email or drop by #grafana on IRC (freenode).
Many thanks to [RethinkDB](http://rethinkdb.com) for permission to re-use their CLA!
h2 Terms of the Agreement
---
## Terms of the Agreement
<hr>
This Contributor License Agreement (“Agreement”) is entered into between Coding Instinct AB,
a Swedish corporation (“Grafana,” “we” or “us” etc.) and you (as defined and further identified below).
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment