Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Björn Kaiser
2016-02-12 20:37:10 +00:00
85 changed files with 3343 additions and 1287 deletions

View File

@@ -1,7 +1,7 @@
// A bunch of different tests are in here - it isn't very thematic.
// It would probably be better to refactor them into different files.
var DatabaseAdapter = require('../DatabaseAdapter');
var DatabaseAdapter = require('../src/DatabaseAdapter');
var request = require('request');
describe('miscellaneous', function() {