K 10 svn:author V 3 wen K 8 svn:date V 27 2018-12-05T23:55:39.475801Z K 7 svn:log V 50 - Adjust CONFLICTS after moodle36 update to 3.6.1 END