1 commit

Author	SHA1	Message	Date
tim1234ltp	ad50f90ba0	Bug fixes on Merchandise Page [Fixes Issues #9144] (#9195) ... * Moved pictures of merch items from assets/images/merch/ to /website/static/merch Image src in merch.vue is linked to the new path. * Rebased and fixed. * Reverted changes of package-lock.json	2017-10-17 10:48:23 -05:00