Skip to content
Snippets Groups Projects
Commit 3c388314 authored by Theo Steininger's avatar Theo Steininger
Browse files

Merge branch 'misc_tweaks' into 'master'

# Conflicts:
#   nifty/sugar.py
parents aa21eae3 95248edc
No related branches found
No related tags found
2 merge requests!141Master,!137Master
Pipeline #
Showing
with 35 additions and 107 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