Merge branch 'master' of https://github.com/gitlabhq/gitlabhq

Dmitriy Zaporozhets
2 parents 9653ddf6 5dd4fb82
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
config/gitlab.yml.example
@@ -107,7 +107,7 @@ production: &amp;base
     #   ##  :id                - Issue id (from commit messages)
     #   issues_url: "http://redmine.sample/issues/:id"
     #
-    #   ## If not nil, linkis to creating new issues will be replaced with this
+    #   ## If not nil, links to creating new issues will be replaced with this
     #   ## Use placeholders:
     #   ##  :project_id        - GitLab project identifier
     #   ##  :issues_tracker_id - Project Name or Id in external issue tracker
...	...	@@ -107,7 +107,7 @@ production: &base
107	107	# ## :id - Issue id (from commit messages)
108	108	# issues_url: "http://redmine.sample/issues/:id"
109	109	#
110		- # ## If not nil, linkis to creating new issues will be replaced with this
	110	+ # ## If not nil, links to creating new issues will be replaced with this
111	111	# ## Use placeholders:
112	112	# ## :project_id - GitLab project identifier
113	113	# ## :issues_tracker_id - Project Name or Id in external issue tracker
...	...