ruby version
Merge branch 'master' of github.com:olownia/antoni-misiewicz

Conflicts:
	.versions.conf