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

..

app.vue

Redesign: Static Pages Wrapper (#9027)

2017-09-15 13:59:15 -05:00

clearBrowserData.vue

Redesign: Static Pages Wrapper (#9027)

2017-09-15 13:59:15 -05:00

communityGuidelines.vue

New client 2017 09 16 - Fox_town, adjust URLs in links, etc (#9042)

2017-09-16 22:19:07 +10:00

contact.vue

Redesign: Static Pages Wrapper (#9027)

2017-09-15 13:59:15 -05:00

faq.vue

Redesign: Static Pages Wrapper (#9027)

2017-09-15 13:59:15 -05:00

features.vue

Merge develop into release (#9154)

2017-10-03 21:15:00 -05:00

groupPlans.vue

Paglias Client Fixes (#9086)

2017-09-27 20:59:49 +02:00

header.vue

Sept 26 fixes (#9081)

2017-09-26 15:04:29 -05:00

home.vue

Client: Tasks and Header v2 (#9168)

2017-10-16 22:04:16 +02:00

merch.vue

Bug fixes on Merchandise Page [Fixes Issues #9144] (#9195)

2017-10-17 10:48:23 -05:00

newStuff.vue

fix(news): add links

2017-10-17 00:01:39 +00:00

overview.vue

Client: Tasks and Header v2 (#9168)

2017-10-16 22:04:16 +02:00

pressKit.vue

Sept 26 fixes (#9081)

2017-09-26 15:04:29 -05:00

privacy.vue

Redesign: Static Pages Wrapper (#9027)

2017-09-15 13:59:15 -05:00

staticWrapper.vue

Client: Tasks and Header v2 (#9168)

2017-10-16 22:04:16 +02:00

terms.vue

Redesign: Static Pages Wrapper (#9027)

2017-09-15 13:59:15 -05:00