Merge branch 'master' of github.com:kern/filepizza

lib/components/App.js

@@ -40,7 +40,7 @@ export default class App extends React.Component {
         <meta property="og:image" content="http://file.pizza/images/fb.png" />
         <title>FilePizza - Your files, delivered.</title>
 
-        <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Quicksand:300,400,700|Lobster+Two" />
+        <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Quicksand:300,400,700|Lobster+Two" />
         <link rel="stylesheet" href="/css" />
 
         <script src="//cdn.jsdelivr.net/webtorrent/latest/webtorrent.min.js" />

lib/ice.js

@@ -7,6 +7,13 @@ if (process.env.TWILIO_SID && process.env.TWILIO_TOKEN) {
   var client = null
 }
 
+var DEFAULT_ICE_SERVERS = [
+  {
+    url: 'stun:23.21.150.121', // deprecated, replaced by `urls`
+    urls: 'stun:23.21.150.121'
+  }
+]
+
 var CACHE_LIFETIME = 5 * 60 * 1000 // 5 minutes
 var cachedPromise = null
 
@@ -15,7 +22,7 @@ function clearCache() {
 }
 
 exports.getICEServers = function () {
-  if (client == null) return Promise.resolve({})
+  if (client == null) return Promise.resolve(DEFAULT_ICE_SERVERS)
   if (cachedPromise) return cachedPromise
 
   cachedPromise = new Promise(function (resolve, reject) {