Skip to content
Snippets Groups Projects
Commit 64a56050 authored by Otowa Kotori's avatar Otowa Kotori
Browse files

Merge remote-tracking branch 'upstream/master' into 1.7misc

parents fd3b4834 65f67b10
No related branches found
No related tags found
1 merge request!630otowakotori 1.7 misc fixes
Showing
with 339 additions and 96 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment