Commit e84900dd authored by neosam's avatar neosam
Browse files

Merge branch 'rahix/wip' into 'master'

Implement bottle angel shift (and the underlying shift management code)

Closes #12

See merge request !29
parents 8f824eb0 3f22c558