Torkel Ödegaard 0d083bad14 Merge branch 'master' of github.com:grafana/grafana %!s(int64=9) %!d(string=hai) anos
..
apikeygen c75aa23092 New implementation for API Keys that only stores hashed api keys, and the client key is base64 decoded json web token with the unhashed key, Closes #1440 %!s(int64=10) %!d(string=hai) anos
dynmap 1f9f439acb lib(): added simplejson lib %!s(int64=9) %!d(string=hai) anos
imguploader 0d083bad14 Merge branch 'master' of github.com:grafana/grafana %!s(int64=9) %!d(string=hai) anos
renderer 2b276d5cd1 feat(alerting): working on alert notification and image rendering %!s(int64=9) %!d(string=hai) anos
simplejson 0398face05 feat(plugins): dashboard import for data sources is working! #4298 %!s(int64=9) %!d(string=hai) anos