New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Closed
wants to merge 1 commit into
base: develop
from

Conversation

Projects
None yet
3 participants
@movilla
Contributor

movilla commented Oct 13, 2012

Previous #3652

Now works :]

@jhass

This comment has been minimized.

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

Merge branch 'popup_notifications' of git://github.com/movilla/diaspo…
…ra into notification-popup

merge pull request #3656

Conflicts:
	Changelog.md (resolved)
@Raven24

This comment has been minimized.

Member

Raven24 commented Oct 13, 2012

thanks!
merged (manually).

@Raven24 Raven24 closed this Oct 13, 2012

@movilla

This comment has been minimized.

Contributor

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