Add the discussion to the DeleteComment event.
When merging activities don't store every single user, just the first 20.
Make sure to set Wysiwyg format when viewing the quote page directly.
Bump version to 2.2.4.
Merge branch 'stage' of github.com:vanillaforums/Garden
Add BeforeFlyoutMenu event and DashboardCount arg to MeModule
Comment out bad copy/paste in DiscussionModel GetUnreadCount
Let GetRecord handle activity type
Only remove the format when editing posts if Garden.ForceInputFormatter is true.
Merge branch 'hotfix/soompi'
Merge branch 'master' of github.com:vanillaforums/Garden
Added DiscussionModel->Bookmark(). It's a cleaner version of DiscussioModel->BookmarkDiscussion() that doesn't join a bunch of tables and does just the job of bookmarking.
Modified discussion/bookmark to work better as an API endpoint.
Merge branch 'stage' of github.com:vanillaforums/Garden into stage
Merge branch 'master' into stage