Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Mayesters 2017-06-03 13:06:41 +02:00
commit e36fa6623b

View file

@ -3,7 +3,7 @@ import lbry from 'lbry'
export function doFetchDaemonSettings() { export function doFetchDaemonSettings() {
return function(dispatch, getState) { return function(dispatch, getState) {
lbry.get_settings().then((settings) => { lbry.settings_get().then((settings) => {
dispatch({ dispatch({
type: types.DAEMON_SETTINGS_RECEIVED, type: types.DAEMON_SETTINGS_RECEIVED,
data: { data: {