Merge branch 'master' into star

This commit is contained in:
Kim Gardner
2017-03-03 13:24:32 -05:00
committed by GitHub
2 changed files with 7 additions and 1 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "talk",
"version": "1.0.1",
"version": "1.1.0",
"description": "A commenting platform from The Coral Project. https://coralproject.net",
"main": "app.js",
"scripts": {
+6
View File
@@ -1,7 +1,13 @@
const express = require('express');
const path = require('path');
const pkg = require('../package.json');
const router = express.Router();
router.get('/', (req, res) => {
res.json({version: pkg.version});
});
router.use('/api/v1', require('./api'));
router.use('/admin', require('./admin'));
router.use('/embed', require('./embed'));