lams-github

Clone
Marcin Cieslak
committed
139e91c
on 28 Nov 18
Merge remote-tracking branch 'origin/master' into lams31
Conflicts:
lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet… Show more
Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

        lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java

        lams_central/web/forgotPassword.jsp

        lams_central/web/forgotPasswordChange.jsp

        lams_central/web/forgotPasswordProc.jsp

        lams_tool_assessment/web/pages/learning/results.jsp

Show less