search

CNCLgithub / rooms-psiturk

1 stars 0 forks source link

merging #4

Open belledon opened 3 years ago

belledon commented 3 years ago

@victoriaaa333 , i merged some of your previous commits to my branch and then merged to master. this should keep you in sync. feel free to merge when you want