lams-github

Clone
Andrey Balan
committed
71601be
on 28 Dec 19
Merge branch 'LDEV-4932' of https://github.com/lamsfoundation/lams into LDEV-4932
# Conflicts:
# lams_central/conf/security/Owasp.CsrfGuard.… Show more
Merge branch 'LDEV-4932' of https://github.com/lamsfoundation/lams into LDEV-4932

# Conflicts:

#       lams_central/conf/security/Owasp.CsrfGuard.properties

#       lams_tool_larsrc/web/WEB-INF/web.xml

#       lams_tool_leader/web/WEB-INF/web.xml

Show less