ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIXED STUFF FROM THE MERGE SORRY ;_;

rebase/4.0.0rc2
kibigo! 2017-07-15 15:42:39 -07:00
parent 144db8ea1d
commit 4715161a93
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/actions/compose.js
View File

@ -72,7 +72,7 @@ export function mentionCompose(account, router) {
export function submitCompose() {
return function (dispatch, getState) {
const status = getState().getIn(['compose', 'text'], '');
let status = getState().getIn(['compose', 'text'], '');
if (!status || !status.length) {
return;

3
app/javascript/mastodon/reducers/index.js
View File

@ -34,11 +34,8 @@ const reducers = {
statuses,
relationships,
settings,
<<<<<<< HEAD
local_settings,
=======
push_notifications,
>>>>>>> upstream
cards,
reports,
contexts,