branch master updated (abd1d5d -> e009008)
This is an automated email from the git hooks/post-receive script. New change to branch master in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from abd1d5d [jgitflow-maven-plugin]merging 'release/1.6.1' into 'master' adds cea90fd [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 5db3900 [jgitflow-maven-plugin]merging 'master' into 'develop' adds aae138f [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 2396abf fixes #132: Add honey pot adds 12ee8e3 Update struts adds ff3ed90 [jgitflow-maven-plugin]updating poms for 1.6.2 branch with snapshot versions adds c0e84db [jgitflow-maven-plugin]updating poms for branch'release/1.6.2' with non-snapshot versions adds e009008 [jgitflow-maven-plugin]merging 'release/1.6.2' into 'master' No new revisions were added by this update. Summary of changes: bow-extension-chromium/pom.xml | 2 +- bow-ui/pom.xml | 2 +- .../org/chorem/bow/action/login/RegisterAction.java | 20 +++++++++++++++++++- bow-ui/src/main/webapp/WEB-INF/jsp/inc/footer.jsp | 2 +- bow-ui/src/main/webapp/WEB-INF/jsp/register.jsp | 3 ++- bow-ui/src/main/webapp/css/connexion.css | 6 +++++- pom.xml | 4 ++-- 7 files changed, 31 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm