1
0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 01:25:17 +01:00

Merge branch 'master' of bitbucket.org:ascribe/onion

This commit is contained in:
diminator 2015-07-03 10:41:32 +02:00
commit b760d23813
2 changed files with 3 additions and 3 deletions

View File

@ -1,12 +1,11 @@
'use strict';
require("babel/polyfill");
import React from 'react';
import Router from 'react-router';
import promise from 'es6-promise';
promise.polyfill();
import fetch from 'isomorphic-fetch';
//require('isomorphic-fetch');
import ApiUrls from './constants/api_urls';
import routes from './routes';

View File

@ -40,6 +40,7 @@
"dependencies": {
"alt": "^0.16.5",
"audiojs": "vrde/audiojs",
"babel": "^5.6.14",
"babelify": "^6.1.2",
"bootstrap-sass": "^3.3.4",
"browser-sync": "^2.7.5",