Merge pull request #830 from yemel/fix/peer-id-taken

Derive token from cid, bring back the custom version of peerjs
This commit is contained in:
Matias Alejo Garcia 2014-07-07 15:55:46 -03:00
commit 2626414771
3 changed files with 2 additions and 16 deletions

View file

@ -927,7 +927,7 @@ on supported browsers please check <a href="http://www.webrtc.org/">http://www.w
<script src="lib/angular-route/angular-route.min.js"></script>
<script src="lib/angular-foundation/mm-foundation.min.js"></script>
<script src="lib/angular-foundation/mm-foundation-tpls.min.js"></script>
<script src="lib/peerjs/peer.min.js"></script>
<script src="lib/peer.js"></script> <!-- TODO Change this on PeerJS version 0.3.9 -->
<script src="lib/bitcore/browser/bundle.js"></script>
<script src="lib/crypto-js/rollups/sha256.js"></script>
<script src="lib/crypto-js/rollups/pbkdf2.js"></script>