Matt Zabriskie 5fc59a65aa Resolving merge conflicts

2016-03-05 23:56:02 -07:00

..

adapters

Resolving merge conflicts

2016-03-05 23:56:02 -07:00

core

switches check order of xhr/http for electron

2016-02-15 22:38:56 -07:00

helpers

Changing btoa ponyfill to improve testing

2016-03-03 22:43:16 -07:00

axios.js

Bit of code cleanup

2016-01-24 15:27:30 -07:00

defaults.js

fix typo

2016-02-02 21:09:25 +09:00

utils.js

Fixing config weirdness

2015-12-24 11:44:46 -07:00