Commit 03bbcd76 authored by Dan Notestein's avatar Dan Notestein
Browse files

Merge branch... 

Merge branch 'jsalyers-new-branch-because-im-sick-of-merge-conflicts-that-shouldnt-exist' into 'develop'

[JES] Pass observer through to bridge.get_discussion

See merge request !385
parents 78d2f53d e756c082
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment