Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 gadi atpakaļ
..
010_add_platform_class.js 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 gadi atpakaļ