Skip to content
Commit 48b49117 authored by Oleg Nenashev's avatar Oleg Nenashev
Browse files

Merge branch 'master' into translations/russian_bigscoop



Signed-off-by: default avatarOleg Nenashev <o.v.nenashev@gmail.com>

Conflicts:
	core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_ru.properties
	core/src/main/resources/jenkins/model/Jenkins/systemInfo_ru.properties
parents c92b18aa 6e39dd35
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment