Fisheye: Diff - lams-github/lams_admin/web/config/editconfig.jsp

Tree
Options

ca098d6

LDEV-5424 rename Page5.tag->PageAdmin.tag

09 Feb 24 Andrey Balan ca098d61e6eb6a97a606dc32edb14a2afa01565e

Merge remote-tracking branch 'origin/v4.7' into LDEV-5397
# Conflicts:
# lams_admin/conf/language/lams/ApplicationResources.properties
# lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
# lams_admin/web/timezoneManagement.jsp
# lams_central/conf/language/lams/ApplicationResources.properties
# lams_central/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_doku/conf/language/lams/ApplicationResources.properties
# lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_larsrc/conf/language/lams/ApplicationResources_de_DE.properties
# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties
# lams_tool_mindmap/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_preview/conf/language/lams/ApplicationResources_de_DE.properties
# lams_tool_scratchie/web/pages/learning/learning.jsp
# lams_tool_survey/conf/language/lams/ApplicationResources_de_DE.properties
# lams_tool_whiteboard/conf/language/lams/ApplicationResources.properties
# lams_tool_whiteboard/conf/language/lams/ApplicationResources_en_AU.properties

18 Dec 23 Marcin Cieslak 6773df2f14e862722e0c63f969649af559ec0439

Loading ...