Merge branch 'hotline#16344_css_editor' into origin-hotline_6.52
Conflicts: VERSIONS
Showing
- VERSIONS 2 additions, 0 deletionsVERSIONS
- amber/afi/js/AFI-OPAC.deploy.js 8 additions, 5 deletionsamber/afi/js/AFI-OPAC.deploy.js
- amber/afi/js/AFI-OPAC.js 10 additions, 7 deletionsamber/afi/js/AFI-OPAC.js
- amber/afi/st/AFI-OPAC.st 6 additions, 6 deletionsamber/afi/st/AFI-OPAC.st
- amber/src/js/amber.js 1 addition, 0 deletionsamber/src/js/amber.js
- amber/src/js/lib/CodeMirror/codemirror.css 242 additions, 106 deletionsamber/src/js/lib/CodeMirror/codemirror.css
- amber/src/js/lib/CodeMirror/codemirror.js 7202 additions, 2514 deletionsamber/src/js/lib/CodeMirror/codemirror.js
Please register or sign in to comment