Merge branch 'master' of https://github.com/tagyro/AMLocalizedString · tagyro/AMLocalizedString@da3a64d · GitHub

Commit

Merge branch 'master' of https://github.com/tagyro/AMLocalizedString

Browse files

Conflicts:
	.gitignore
	LocalizationSystem.h
	LocalizationSystem.m
	README.md

Loading branch information

tagyro committed Nov 16, 2015

2 parents 1e55b17 + 0d496b1 commit da3a64d