Merge release branch 4.7 to master * 4.7: CLOUDSTACK-9267: String is not localized on create instance wizards.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7a9bfce4 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7a9bfce4 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7a9bfce4 Branch: refs/heads/master Commit: 7a9bfce427a8b4170261f96ab20e7916e96ac97b Parents: 908b769 9610056 Author: Rafael Weingärtner <raf...@apache.org> Authored: Thu Feb 25 09:40:54 2016 -0300 Committer: Rafael Weingärtner <raf...@apache.org> Committed: Thu Feb 25 09:40:54 2016 -0300 ---------------------------------------------------------------------- ui/scripts/network.js | 8 ++++---- ui/scripts/ui-custom/instanceWizard.js | 2 +- ui/scripts/ui-custom/projects.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) ----------------------------------------------------------------------