Skip to content
GitLab
Commit 64898b57 authored by Aggelos Avgerinos's avatar Aggelos Avgerinos
Browse files

No-op merge tag 'upstream/1.5.4' 

Merge upstream branch up to current stable to reconcile history that was
lost because of a rebase.
parents c8335bae c03839cf
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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