Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
y-lohse committed Mar 13, 2016
2 parents 0d83895 + 8727869 commit 571350a
Show file tree
Hide file tree
Showing 34 changed files with 308 additions and 221 deletions.
36 changes: 3 additions & 33 deletions client/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -201,20 +201,10 @@ System.config({
}
},
bundles: {
"app-build-d5c126cdef.js": [
"SnapshotsDB.js",
"add-snapshot-form.html!github:systemjs/plugin-text@0.0.3.js",
"add-snapshot-form.js",
"app-build-cd89144a80.js": [
"app.html!github:systemjs/plugin-text@0.0.3.js",
"app.js",
"date-format.js",
"index.html!github:systemjs/plugin-text@0.0.3.js",
"index.js",
"main.js",
"snapshot.html!github:systemjs/plugin-text@0.0.3.js",
"snapshot.js",
"snapshots-list.html!github:systemjs/plugin-text@0.0.3.js",
"snapshots-list.js"
"main.js"
],
"aurelia-b23cdcaf13.js": [
"github:jspm/nodelibs-process@0.1.2.js",
Expand Down Expand Up @@ -305,25 +295,5 @@ System.config({
"npm:process@0.11.2/browser.js"
]
},
depCache: {
"add-snapshot-form.js": [
"npm:aurelia-framework@1.0.0-beta.1.1.3.js",
"SnapshotsDB.js"
],
"date-format.js": [
"npm:moment@2.11.2.js"
],
"snapshot.js": [
"npm:aurelia-framework@1.0.0-beta.1.1.3.js",
"SnapshotsDB.js"
],
"snapshots-list.js": [
"npm:aurelia-framework@1.0.0-beta.1.1.3.js",
"SnapshotsDB.js"
],
"SnapshotsDB.js": [
"npm:aurelia-framework@1.0.0-beta.1.1.3.js",
"npm:aurelia-fetch-client@1.0.0-beta.1.1.0.js"
]
}
depCache: {}
});
95 changes: 0 additions & 95 deletions client/dist/SnapshotsDB.js

This file was deleted.

1 change: 1 addition & 0 deletions client/dist/app-build-cd89144a80.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion client/dist/app-build-d5c126cdef.js

This file was deleted.

Loading

0 comments on commit 571350a

Please sign in to comment.