Commit Graph

3 Commits

Author SHA1 Message Date
4bb776f4e5 Merge branch 'release-1.2'
Conflicts:
	Documentation/Documentation-Contents.md
2015-07-15 16:34:27 +03:00
7585adb228 Fixed links. 2015-07-09 23:52:31 +03:00
b0e98bc420 Added template cnf file to /etc and renamed folders. 2015-07-09 14:41:23 +03:00