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

Tree
Options

0132ac7

Merge remote-tracking branch 'origin/v4.6' into v4.7
Conflicts:
lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java
lams_central/web/includes/javascript/orgGroup.js
lams_central/web/orgGroup.jsp
lams_central/web/orgGrouping.jsp
lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java

17 Dec 22 Marcin Cieslak 0132ac7723f6060a3a656d216ac93a1540634c7f

1ba5633

LDEV-5338 Rename JS and CSS files to reflect changes in classes

14 Nov 22 Marcin Cieslak 1ba563378355d4a7e3b284cd645460f396989272

Loading ...