Skip to content

Commit 66596bf

Browse files
beemanbeeman
committed
Merge branch 'modules' of https://github.com/movibe/loopback-angular-admin into movibe-modules
Conflicts: .gitignore bower.json package.json
2 parents f3a32ec + 519c1f0 commit 66596bf

126 files changed

Lines changed: 9897 additions & 1289 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
node_modules
2-
dist
31
.tmp
4-
.sass-cache
5-
bower_components
2+
dist
3+
npm-debug.log
4+
node_modules
5+
downloaded
6+
docular_generated
67
client/app/scripts/lb-services.js
78
client/app/scripts/config.js
8-
storage
9-
npm-debug.log
109
.idea/
10+
storage/
11+
.strong-pm
12+
.sass-cache
13+
providers.json
14+
bower_components
1115
docs
12-
downloaded
13-
docular_generated
14-
.strong-pm/
16+
client/coverage

‎.strong-pm/env.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

0 commit comments

Comments
 (0)