Skip to content

Commit

Permalink
Merge branch 'development' into sortable-2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Le0Michine authored Feb 6, 2017
2 parents 3c9a28d + d1deec0 commit 8ebbac3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
-<a name="1.3.3"></a>
## [1.3.3](https://github.com/valor-software/ng2-bootstrap/compare/v1.3.2...v1.3.3) (2017-02-03)
<a name="1.3.3"></a>
## [1.3.3](https://github.com/valor-software/ng2-bootstrap/compare/v1.3.2...v1.3.3) (2017-02-03)


### Bug Fixes
### Bug Fixes

* **typeahead:** allow to work with formControl ([e3f4854](https://github.com/valor-software/ng2-bootstrap/commit/e3f4854)), closes [#1595](https://github.com/valor-software/ng2-bootstrap/issues/1595)
* **typeahead:** allow to work with formControl ([e3f4854](https://github.com/valor-software/ng2-bootstrap/commit/e3f4854)), closes [#1595](https://github.com/valor-software/ng2-bootstrap/issues/1595)


### Features
### Features

* **package:** export missed things from utils ([54eb13d](https://github.com/valor-software/ng2-bootstrap/commit/54eb13d)), closes [#1584](https://github.com/valor-software/ng2-bootstrap/issues/1584) [#1590](https://github.com/valor-software/ng2-bootstrap/issues/1590)
* **package:** export missed things from utils ([54eb13d](https://github.com/valor-software/ng2-bootstrap/commit/54eb13d)), closes [#1584](https://github.com/valor-software/ng2-bootstrap/issues/1584) [#1590](https://github.com/valor-software/ng2-bootstrap/issues/1590)



Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"flow.github-release": "conventional-github-releaser -p angular",
"build": "ngm build -p src --clean",
"build.watch": "ngm build -p src --watch --skip-bundles",
"start": "ng serve --aot",
"start": "ng serve --aot --host 0.0.0.0",
"generate-bs4": "node scripts/generate-bs4.js",
"pretest": "run-s lint build link",
"test": "ng test -sr",
Expand Down Expand Up @@ -73,7 +73,7 @@
"@angular/platform-browser-dynamic": "^2.4.4",
"@angular/router": "^3.4.4",
"@angular/tsc-wrapped": "0.5.1",
"@ngtools/webpack": "^1.2.7",
"@ngtools/webpack": "1.2.7",
"@types/jasmine": "^2.5.41",
"@types/marked": "0.0.28",
"@types/node": "7.0.0",
Expand Down

0 comments on commit 8ebbac3

Please sign in to comment.