Commit e924f3fe authored by Vytor Calixto's avatar Vytor Calixto 👾

Merge branch 'classroom_count' into release_v1.2.0

Conflicts:
	src/libs/routes/api.js
	src/libs/routes/glossEnrollmentRatio.js
parents 293ee70c 184a8816
......@@ -62,6 +62,8 @@ const siope = require(`${libs}/routes/siope`);
const outOfSchool = require(`${libs}/routes/outOfSchool`);
const classroomCount = require(`${libs}/routes/classroomCount`);
api.get('/', (req, res) => {
res.json({ msg: 'SimCAQ API is running' });
});
......@@ -95,5 +97,6 @@ api.use('/infrastructure', infrastructure);
api.use('/distribution_factor', distributionFactor);
api.use('/siope', siope);
api.use('/out_of_school', outOfSchool);
api.use('/classroom_count', classroomCount);
module.exports = api;
const express = require('express');
const express = require('express');
const classroomApp = express.Router();
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment