Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
kamilmysliwiec committed Dec 21, 2017
2 parents fffabe9 + 4504ec7 commit e433e5d
Show file tree
Hide file tree
Showing 5 changed files with 1,320 additions and 2,469 deletions.
1 change: 1 addition & 0 deletions .angular-cli.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"tsconfig": "tsconfig.app.json",
"testTsconfig": "tsconfig.spec.json",
"prefix": "app",
"serviceWorker": true,
"styles": [
"styles.scss"
],
Expand Down
Loading

0 comments on commit e433e5d

Please sign in to comment.