Skip to content

Commit 0892d2c

Browse files
authored
Merge pull request #45 from kevoj/master
Merge development branch with master
2 parents 857742e + bca2d6c commit 0892d2c

File tree

8 files changed

+29122
-117
lines changed

8 files changed

+29122
-117
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# angular-editor-fabric-js
22

3-
> Drag-and-drop editor based on Fabricjs for Angular v5 with multiple options
3+
> Drag-and-drop editor based on Fabricjs for Angular with multiple options
44
55
### Example
66
![Imgur](https://i.imgur.com/sQsL8G4.png)
@@ -67,4 +67,4 @@ Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protrac
6767
Before running the tests make sure you are serving the app via `ng serve`.
6868

6969
## License
70-
MIT © [Leonardo Rico](https://github.com/kevoj/angular-editor-fabric-js/blob/master/LICENSE)
70+
[MIT ©](https://github.com/kevoj/angular-editor-fabric-js/blob/master/LICENSE)

angular.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3-
"version": 1,
3+
"version": 1,
44
"newProjectRoot": "projects",
55
"projects": {
66
"angular-editor-fabric-js-app": {
@@ -165,6 +165,10 @@
165165
}
166166
}
167167
}
168-
}},
169-
"defaultProject": "angular-editor-fabric-js-app"
170-
}
168+
}
169+
},
170+
"defaultProject": "angular-editor-fabric-js-app",
171+
"cli": {
172+
"analytics": "45fc0ac5-6d55-4254-98db-3e87ba5a084f"
173+
}
174+
}

0 commit comments

Comments
 (0)