Merge remote-tracking branch 'upstream/master' into docker
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/3db5f15d Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/3db5f15d Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/3db5f15d Branch: refs/heads/master Commit: 3db5f15dad63999723d49a2e700dbc9598ad1a9d Parents: 685ced6 cd1e39e Author: Thiago Veronezi <[email protected]> Authored: Wed Jan 11 13:37:15 2017 -0500 Committer: Thiago Veronezi <[email protected]> Committed: Wed Jan 11 13:37:15 2017 -0500 ---------------------------------------------------------------------- .../java/org/superbiz/moviefun/rest/MoviesRest.java | 2 ++ .../src/main/webapp/app/js/model/movie.js | 16 +++++++++++++--- .../src/main/webapp/app/js/model/movies.js | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
