Skip to content
Snippets Groups Projects
Commit 6a4a5120 authored by Jan-Jaap Korpershoek's avatar Jan-Jaap Korpershoek
Browse files

Merge branch 'changeskin_hook' into 'changeskin_hook'

Merge conflicts with latest `next` solved

See merge request !2
parents 4486ed61 6c42420c
1 merge request!2Merge conflicts with latest `next` solved
Showing
with 24 additions and 71 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment