Merge master into release-1.3

Resolved Conflicts:
	.gitignore
	README.md
This commit is contained in:
Martin Kemp
2015-11-20 10:45:33 +00:00
2 changed files with 5 additions and 5 deletions

View File

@ -1,3 +1,3 @@
## Config
All config files must be in this folder. If there is no option to set this folder directly, it has to be hardlinked.
All config files must be in this folder. If there is no option to create or read from this folder directly, it must be hardlinked.