Skip to content
Snippets Groups Projects
Commit 72e4bd44 authored by Carl Gwilliam's avatar Carl Gwilliam
Browse files

Merge branch 'mcgen' into 'master' 

Add Lottie's truth updates and also fix veto station naming

See merge request faser/calypso!328
parents f6ac3a9b 53fcd3e6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment