Skip to content

Fix problem javascript with read-unread notifications on notifications popup#3656

Closed
movilla wants to merge 1 commit intodiaspora:developfrom
movilla:popup_notifications
Closed

Fix problem javascript with read-unread notifications on notifications popup#3656
movilla wants to merge 1 commit intodiaspora:developfrom
movilla:popup_notifications

Conversation

@movilla
Copy link
Copy Markdown
Contributor

@movilla movilla commented Oct 13, 2012

Previous #3652

Now works :]

@jhass
Copy link
Copy Markdown
Member

jhass commented Oct 13, 2012

Hm guess I caused you some trouble with the changelog change, sorry. Try the following:

git checkout develop
git pull upstream develop
git checkout popup_notifications
git rebase develop # might cause some conflict, if so fix it, git add the file and do git rebase --continue
# edit Changelog.md to look nice
git add Changelog.md
git commit --amend
git push -f origin popup_notifications

Raven24 added a commit that referenced this pull request Oct 13, 2012
…ra into notification-popup

merge pull request #3656

Conflicts:
	Changelog.md (resolved)
@Raven24
Copy link
Copy Markdown
Member

Raven24 commented Oct 13, 2012

thanks!
merged (manually).

@Raven24 Raven24 closed this Oct 13, 2012
@movilla
Copy link
Copy Markdown
Contributor Author

movilla commented Oct 13, 2012

Aajjajaajjaja Thank you both :]

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants