Merge branch 'master' into i18n

This commit is contained in:
Mayesters 2017-06-03 13:06:53 +02:00
commit fb36cf12f1

View file

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