UUDigitalHumanitieslab / sastadev

Method definitions for use in SASTA
BSD 3-Clause "New" or "Revised" License
0 stars 0 forks source link

Feature/subj updates #16

Closed JeltevanBoheemen closed 1 year ago

JeltevanBoheemen commented 1 year ago

This PR contains the most recent changes to branch subj, compared to master.

subj was previously merged into master, and was thus behind. I rebased the three changes since the last merge onto subj-updates. These should now reflect the intended changes.

Merge strategy is either, based on whatever changes are easiest to digest for Git: