Merge branch 'master' into develop

2016-05-21 09:21:38 +02:00
parent 1a9b749017 2afab43281
commit e0a656e2ba
7 changed files with 22 additions and 17 deletions
@@ -8,7 +8,6 @@ var RunsDatastore       = require('../datastores/runsDatastore');
 var ResultsDatastore    = require('../datastores/resultsDatastore');
 var serverSettings      = require('../../../server_config/settings.json');

-
 var ApiController = function(app) {
    'use strict';

@@ -16,8 +15,6 @@ var ApiController = function(app) {
    var runsDatastore = new RunsDatastore();
    var resultsDatastore = new ResultsDatastore();

-
-
    // Create a new run
    app.post('/api/runs', function(req, res) {

@@ -330,4 +327,4 @@ var ApiController = function(app) {

 };

-module.exports = ApiController;
+module.exports = ApiController;