fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-15 11:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIXED STUFF FROM THE MERGE SORRY ;_;

Browse source
This commit is contained in:
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() { export function submitCompose() {
return function (dispatch, getState) { return function (dispatch, getState) {
const status = getState().getIn(['compose', 'text'], ''); let status = getState().getIn(['compose', 'text'], '');
if (!status || !status.length) { if (!status || !status.length) {
return; return;

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

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