Skip to content
Snippets Groups Projects
Commit 7dd7f234 authored by Feanil Patel's avatar Feanil Patel
Browse files

Merge commit 'bbadf48b' into feanil/merge_more_of_master 

Sorry for the merge commits but release was in a really bad state and so
we need to get changes out piecemeal on the release-candidate.

Slowly mergig master into RC.
parents d9302ab7 bbadf48b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 189 additions and 98 deletions
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