Merge remote-tracking branch 'origin/LDEV-5391' into LDEV-5391
# Conflicts:
# idea_project/.idea/.name
# idea_project/.idea/runConfiguration… Show more
# Conflicts:
# idea_project/.idea/.name
# idea_project/.idea/runConfiguration… Show more
Merge remote-tracking branch 'origin/LDEV-5391' into LDEV-5391# Conflicts:# idea_project/.idea/.name# idea_project/.idea/runConfigurations/WildFly.xml# lams_admin/web/WEB-INF/tags/Rating.tag# lams_central/web/WEB-INF/tags/Rating.tag# lams_gradebook/web/WEB-INF/tags/Rating.tag# lams_learning/web/WEB-INF/tags/Rating.tag# lams_monitoring/web/WEB-INF/tags/Rating.tag# lams_tool_assessment/web/WEB-INF/tags/Rating.tag# lams_tool_chat/web/WEB-INF/tags/Rating.tag# lams_tool_daco/web/WEB-INF/tags/Rating.tag# lams_tool_doku/web/WEB-INF/tags/Rating.tag# lams_tool_doku/web/pages/authoring/advance.jsp# lams_tool_doku/web/pages/learning/galleryWalk.jsp# lams_tool_forum/web/WEB-INF/tags/Rating.tag# lams_tool_gmap/web/WEB-INF/tags/Rating.tag# lams_tool_images/web/WEB-INF/tags/Rating.tag# lams_tool_imscc/web/WEB-INF/tags/Rating.tag# lams_tool_lamc/web/WEB-INF/tags/Rating.tag# lams_tool_laqa/web/WEB-INF/tags/Rating.tag# lams_tool_larsrc/web/WEB-INF/tags/Rating.tag# lams_tool_leader/web/WEB-INF/tags/Rating.tag# lams_tool_mindmap/web/WEB-INF/tags/Rating.tag# lams_tool_nb/web/WEB-INF/tags/Rating.tag# lams_tool_notebook/web/WEB-INF/tags/Rating.tag# lams_tool_pixlr/web/WEB-INF/tags/Rating.tag# lams_tool_preview/.classpath# lams_tool_preview/web/WEB-INF/tags/Rating.tag# lams_tool_preview/web/WEB-INF/tags/StyledRating.tag# lams_tool_sbmt/web/WEB-INF/tags/Rating.tag# lams_tool_scratchie/web/WEB-INF/tags/Rating.tag# lams_tool_scribe/web/WEB-INF/tags/Rating.tag# lams_tool_spreadsheet/web/WEB-INF/tags/Rating.tag# lams_tool_survey/web/WEB-INF/tags/Rating.tag# lams_tool_task/web/WEB-INF/tags/Rating.tag# lams_tool_vote/web/WEB-INF/tags/Rating.tag# lams_tool_whiteboard/web/WEB-INF/tags/Rating.tag# lams_tool_wiki/web/WEB-INF/tags/Rating.tag# lams_tool_zoom/web/WEB-INF/tags/Rating.tag# lams_www/web/WEB-INF/tags/Rating.tag
Show less