Merge branch 'master' of github.com:AmauryCarrade/UHPlugin · zDevelopers/UHPlugin@85f4301 · GitHub

Commit

Merge branch 'master' of github.com:AmauryCarrade/UHPlugin

Browse files

Conflicts:
	src/main/resources/i18n/manifest.yml

Loading branch information

AmauryCarrade committed Dec 23, 2016

2 parents 79d8d18 + 2b6ed82 commit 85f4301