Skip to content

Commit 4b771ca

Browse files
petersirkapetersirka
committed
Merge remote-tracking branch 'origin/v1.7.0'
Conflicts: framework-install-business-logic-source/definitions/install.js framework-install-config/definitions/install.js framework-install-controller/index.js framework-install-definition/index.js framework-install-model/index.js framework-install-module/index.js mongodb/controllers/default.js mongoose/controllers/default.js mongoose/definitions/mongoose.js mongoose/views/homepage.html
2 parents e7551b1 + e998290 commit 4b771ca

File tree

254 files changed

+3358
-1046
lines changed

Some content is hidden

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

254 files changed

+3358
-1046
lines changed

‎angularjs-bootstrap/controllers/default.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
exports.install = function(framework) {
1+
exports.install = function() {
22
framework.route('/*', view_app);
33
};
44

0 commit comments

Comments
 (0)