working on studioJoin
Merge branch 'master' into Gal
working on studioJoin
connecting repo to domain
working on studioJoin
Merge branch 'master' into Gal
Merge branch 'Nir' into Gal
Merge branch 'Nir'
Revert "Merge branch 'master' into Gal"

This reverts commit 5128751fcbd56128ff86ba25027244b2deb08155, reversing
changes made to ef13f187a6cd3365230db3a1439b3c346a81b591.
Revert "Merge branch 'master' into Gal"

This reverts commit 5128751fcbd56128ff86ba25027244b2deb08155, reversing
changes made to ef13f187a6cd3365230db3a1439b3c346a81b591.
Merge branch 'Gal' of https://github.com/galgreshler/Jamstars into Gal
Fixed issues of wavesurfer ready
Fixed some issues in studio
Fixed some issues in studio
Working...
Merge branch 'master' of https://github.com/galgreshler/Jamstars
Merge branch 'Gal'
Fixed some issues
Merge branch 'master' into Nir

Conflicts:
	JS/studioJoin.js
	JS/uploadPanel.js
	studioJoin.php