Fisheye: Diff - lams-github/lams_central/web/forgotPasswordChange.jsp

Tree
Options

4c2d1f3

LDEV-4932 Start using /common/taglibs.jsp in lams_central

08 Jan 20 Andrey Balan 4c2d1f37b92435907ec4ce23cb635a7cd9e4161e

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

28 Nov 18 Marcin Cieslak 139e91caa1fc95af99802e31cb3a4b57ef7ebc5e

Loading ...