Skip to content

Commit ef7b8ea

Browse files
author
jwngr
committed
Merge branch 'master' into jw-upgrade-firebase-2-x-x
2 parents ebe483a + 2842700 commit ef7b8ea

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ language: node_js
22
node_js:
33
- '0.10'
44
- '0.12'
5-
- stable
5+
# - stable
66
sudo: false
77
install:
88
- npm install

package.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,7 @@
1111
"bugs": {
1212
"url": "https://github.com/firebase/reactfire/issues"
1313
},
14-
"licenses": [
15-
{
16-
"type": "MIT",
17-
"url": "http://firebase.mit-license.org/"
18-
}
19-
],
14+
"license": "MIT",
2015
"keywords": [
2116
"react",
2217
"mixin",

tests/reactfire.spec.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ var ReactFireMixin = require('../src/reactfire.js');
1717
// JSDom
1818
var jsdom = require('jsdom');
1919
global.document = jsdom.jsdom(); // Needed for ReactTestUtils shallow renderer
20-
document.createElement = null; // Needed for Firebase
2120

2221
// Test helpers
2322
var TH = require('./helpers.js');

0 commit comments

Comments
 (0)