diff --git a/CHANGELOG.md b/CHANGELOG.md index 98ea48e16..a51734fc8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ + +# 1.3.0 (2018-04-10) + +* Chore: Only reset to upstream/master for major/minor releases (#160) ([e6e619c](https://github.com/box/box-annotations/commit/e6e619c)) +* Chore: Removing DrawingModeController dependency on DocDrawingThread (#161) ([a1c582d](https://github.com/box/box-annotations/commit/a1c582d)) +* Fix: Create highlight dialog is misaligned on first highlight (#159) ([d4d4fdd](https://github.com/box/box-annotations/commit/d4d4fdd)) + + + # 1.2.0 (2018-04-03) diff --git a/README.md b/README.md index 089605d89..e64570398 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![Project Status](https://img.shields.io/badge/status-active-brightgreen.svg?style=flat-square)](http://opensource.box.com/badges/) [![Styled With Prettier](https://img.shields.io/badge/styled_with-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier) [![build status](https://img.shields.io/travis/box/box-content-preview/master.svg?style=flat-square)](https://travis-ci.org/box/box-annotations) -[![version](https://img.shields.io/badge/version-v1.2.0-blue.svg?style=flat-square)](https://github.com/box/box-annotations) +[![version](https://img.shields.io/badge/version-v1.3.0-blue.svg?style=flat-square)](https://github.com/box/box-annotations) [![npm version](https://img.shields.io/npm/v/box-ui-elements.svg?style=flat-square)](https://www.npmjs.com/package/box-ui-elements) [![Greenkeeper badge](https://badges.greenkeeper.io/box/box-annotations.svg)](https://greenkeeper.io/) diff --git a/package.json b/package.json index 6dc3a1b67..0d1d1e8cd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "box-annotations", - "version": "1.2.0", + "version": "1.3.0", "description": "Box Annotations", "author": "Box (https://www.box.com/)", "license": "SEE LICENSE IN LICENSE",