1. 31 Oct, 2017 4 commits
    • Alexander.Trofimov's avatar
      Merge branch 'hotfix/v5.0.3-develop' into develop · 8853411e
      Alexander.Trofimov authored
      # Conflicts:
      #	cell/Local/api.js
      #	cell/api.js
      #	cell/document/editor.js
      #	cell/model/DrawingObjects/Format/ChartSpacePrototype.js
      #	cell/model/DrawingObjects/Format/ImagePrototype.js
      #	cell/native/native.js
      #	common/Charts/DrawingObjects.js
      #	common/Drawings/Format/Format.js
      #	common/Drawings/Format/GroupShape.js
      #	common/Drawings/Format/Image.js
      #	common/Drawings/Format/Shape.js
      #	common/Drawings/States.js
      #	common/Drawings/WorkEvents.js
      #	common/Local/common.js
      #	common/Native/Wrappers/api.js
      #	common/Private/license.js
      #	common/apiBase.js
      #	common/apiCommon.js
      #	common/editorscommon.js
      #	common/scroll.js
      #	slide/Editor/Format/ChartSpacePrototype.js
      #	slide/Editor/Format/ImagePrototype.js
      #	slide/Editor/Format/Presentation.js
      #	slide/Local/api.js
      #	slide/api.js
      #	word/Editor/Document.js
      #	word/Editor/GraphicObjects/Format/ChartSpacePrototype.js
      #	word/Editor/GraphicObjects/Format/ImagePrototype.js
      #	word/Local/api.js
      #	word/api.js
      8853411e
    • Alexander.Trofimov's avatar
      update line endings to merge · 0063d1dd
      Alexander.Trofimov authored
      0063d1dd
    • GoshaZotov's avatar
      7c0efb2b
    • SergeyLuzyanin's avatar
      remove duplicate methods · 29e47c95
      SergeyLuzyanin authored
      29e47c95
  2. 30 Oct, 2017 9 commits
  3. 27 Oct, 2017 5 commits
  4. 26 Oct, 2017 11 commits
  5. 25 Oct, 2017 11 commits