Fisheye: Diff - lams-github/lams

Tree
Options

b6d55d5

Merge remote-tracking branch 'origin/v4.6' into v4.7

07 Jan 23 Marcin Cieslak b6d55d571ea99a87a367fec36df40ec45627b0ea

Merge remote-tracking branch 'origin/LDEV-5302' into v4.7
Conflicts:
lams_admin/conf/language/lams/ApplicationResources_zh_CN.properties
lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java
lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java
lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java
lams_admin/web/user.jsp
lams_central/conf/language/lams/ApplicationResources_zh_CN.properties
lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java
lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java

21 Sep 22 Marcin Cieslak 3f3f34c22194aeaf302e1fd332925dffd35019aa

Loading ...