Sergey Solovyev
c772a4e429
Merge remote-tracking branch 'origin/master'
Conflicts:
android-app-core/res/values-ru/text_about.xml
android-app-core/res/values-ru/text_wizard.xml
android-app-core/res/values/text_about.xml
android-app-core/res/values/text_wizard.xml
pom.xml
2013-07-03 00:08:50 +04:00
..
2013-06-26 12:22:26 +04:00
2013-06-26 12:22:26 +04:00
2013-06-26 12:22:26 +04:00
2013-06-26 12:22:26 +04:00
2013-06-26 12:22:26 +04:00
2013-06-28 00:02:30 +04:00
2013-07-03 00:08:50 +04:00
2013-07-01 23:37:35 +04:00
2013-07-01 23:37:35 +04:00
2013-07-01 23:37:35 +04:00
2013-06-26 21:29:53 +04:00
2013-07-01 23:37:35 +04:00
2013-07-01 23:37:35 +04:00
2013-07-03 00:08:50 +04:00
2013-06-26 12:22:26 +04:00
2013-06-26 12:22:26 +04:00
2013-06-26 12:22:26 +04:00
2013-06-26 12:22:26 +04:00
2013-06-26 12:22:26 +04:00
2013-06-26 12:22:26 +04:00