Merge branch 'pr/226' into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5a60f1f6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5a60f1f6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5a60f1f6 Branch: refs/heads/USERGRID-593 Commit: 5a60f1f641e890c6d2d8968b74718604d2ca1149 Parents: 488fa93 5355864 Author: Shawn Feldman <sfeld...@apache.org> Authored: Fri Apr 17 14:13:39 2015 -0600 Committer: Shawn Feldman <sfeld...@apache.org> Committed: Fri Apr 17 14:13:39 2015 -0600 ---------------------------------------------------------------------- portal/js/login/login-controller.js | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
