Fix merge conflict
Fix merge conflicts
Sorting out CSS for customer offer show page
Merge branch 'master' of https://github.com/RhysStansfield/deal
Fixing Stripe button
Fix merge conflicts
Merge pull request #61 from NadiDami/master

CSS for Customer Offer Show page