Skip to content
Snippets Groups Projects
Unverified Commit 0dffa9d0 authored by Dan Callahan's avatar Dan Callahan
Browse files

Merge remote-tracking branch 'origin/develop' into shellcheck 


Fixes a merge conflict with debian/changelog

Signed-off-by: default avatarDan Callahan <danc@element.io>
parents 1afc6eca 75ca0a61
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 70 additions and 17 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