Commit ca1fd380 authored by Peter Menegay's avatar Peter Menegay
Browse files

Fixed merge conflicts 

Fixed merge conflict
Created flat list of following events -- not categorized by proposition, document, etc
parent ebae4fb5
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