Sergey Solovyev 6977b4c6b8 Merge branch 'dev-number-format-in-editor' into dev ...

Conflicts:
	android-app-core/res/values-ru/text_strings.xml
	android-app-core/res/values-ru/text_wizard.xml
	android-app-core/res/values/text_strings.xml
	android-app-core/res/values/text_wizard.xml

2013-07-01 23:39:23 +04:00

..

src

Merge branch 'dev-number-format-in-editor' into dev

2013-07-01 23:39:23 +04:00

pom.xml

tests fixed

2013-07-01 16:19:06 +04:00