public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'docs-2.0'

Browse Source 
Conflicts:
	docs/sources/installation/configuration.md
	docs/sources/installation/docker.md
This commit is contained in:
Torkel Ödegaard
2015-05-11 08:02:28 +02:00
parent 564162442d 31781bc509
commit a04a403539
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/sources/installation/docker.md
+1 -1
View File
@@ -33,6 +33,6 @@ an `ENV` instruction.
## Configuration
The back-end web server has a number of configuration options. Go the
[Configuration](/installation/configuration) page for details on all
[Configuration](../installation/configuration.md) page for details on all
those options.