Skip to content
Snippets Groups Projects
Unverified Commit 1ea19d7a authored by teor's avatar teor
Browse files

Merge branch 'maint-0.2.9' into maint-0.3.5 

`git merge --strategy ours` to take the 0.3.5 changes for 31001,
and ignore the conflicting 0.2.9 changes.
parents 21c3488a 7660a7cf
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 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