Skip to content

Commit d68fbee

Browse files
committed
Merge branch 'development'
# Conflicts: # dist/src/carousel.component.js.map
2 parents 496a81e + 55df7c6 commit d68fbee

14 files changed

+83
-189
lines changed

dist/bundles/ng2-carousel-module.umd.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/bundles/ng2-carousel-module.umd.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular2-carousel",
3-
"version": "1.0.5",
3+
"version": "1.0.6",
44
"description": "Angular 2 Minimalist carousel",
55
"main": "bundles/ng2-carousel-module.umd.js",
66
"module": "index.js",
@@ -32,9 +32,8 @@
3232
"url": "https://github.com/kappys1/angular2-carrousel/issues"
3333
},
3434
"peerDependencies": {
35-
"@angular/common": ">=2.0.0",
36-
"@angular/core": ">=2.0.0 ",
37-
"@angular/platform-browser": ">=2.0.0 ",
35+
"@angular/core": ">=2.0.0 <5.0.0 || >=2.0.0-beta <5.0.0",
36+
"@angular/platform-browser": ">=2.0.0 <5.0.0 || >=2.0.0-beta <5.0.0",
3837
"rxjs": "^5.0.1",
3938
"hammerjs": "^2.0.8",
4039
"@types/hammerjs": "^2.0.35"

dist/src/Carousel.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)