Permalink
Browse files

Merge branch 'master' of github.com:fh-koeln/LevelPad

  • Loading branch information...
2 parents b77900d + 96fdedb commit bd93a3d0e83a523a74449b66a78a6e59811a68a1 @jerolimov jerolimov committed Jul 14, 2014
Showing with 5 additions and 4 deletions.
  1. +1 −0 .gitignore
  2. +3 −3 app/resources/{Subjects.js → subjects/index.js}
  3. +1 −1 config/routes.js
View
@@ -6,3 +6,4 @@
*.tmp
*.iml
*.sass-cache
+Thumbs.db
@@ -1,8 +1,8 @@
var express = require('express'),
subjects = express.Router(),
- Subject = require('../models/Subject'),
- Module = require('../models/Module'),
- helpers = require('./_helpers');
+ Subject = require('../../models/Subject'),
+ Module = require('../../models/Module'),
+ helpers = require('../_helpers');
require('url');
View
@@ -8,7 +8,7 @@ var express = require('express'),
api.use(acl.middleware);
api.use('/modules', require('../app/resources/modules'));
-api.use('/subjects', require('../app/resources/Subjects'));
+api.use('/subjects', require('../app/resources/subjects'));
api.use('/users', require('../app/resources/users'));
var routes = express.Router();

0 comments on commit bd93a3d

Please sign in to comment.