Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/struts into develop
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/003fe35c Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/003fe35c Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/003fe35c Branch: refs/heads/develop Commit: 003fe35c909920bc5e5af2473c0376bc126c0b17 Parents: ebb1e3f 0127963 Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Fri May 15 21:36:20 2015 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Fri May 15 21:36:20 2015 +0200 ---------------------------------------------------------------------- .../src/main/webapp/js/controllers.js | 8 ++++---- .../src/main/webapp/js/services.js | 15 ++++++++------- 2 files changed, 12 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
