Merge branch 'patch-1' of https://github.com/solomax/flex-utilities into develop
Conflicts:
installer/src/properties/ru_RU.properties
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/13ffbaff
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/13ffbaff
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/13ffbaff
Branch: refs/heads/develop
Commit: 13ffbaff9d6c1abf32eb5d3711342698425e1a99
Parents: 0649b10 c7c9c8c
Author: piotrz <[email protected]>
Authored: Mon Jan 26 23:03:57 2015 +0100
Committer: piotrz <[email protected]>
Committed: Mon Jan 26 23:03:57 2015 +0100
----------------------------------------------------------------------
installer/src/properties/ru_RU.properties | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
