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

Fixed merge conflicts 

Fixed bug where new feed generator was not showing events
parent 6de0aaf9
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