Rohan Mitchell
|
fe61cddda6
|
Merge branch 'local-organics'
Conflicts:
Gemfile
Gemfile.lock
app/assets/stylesheets/store/variables.css.scss
app/overrides/add_feedback_script.rb
app/views/spree/shared/_order_details_steps_data.html.erb
db/schema.rb
script/rails
spec/spec_helper.rb
|
2013-07-23 11:40:03 +10:00 |
|
Rob H
|
f055ece503
|
WIP (Spree Update): update variables.css.scss
|
2013-07-23 10:43:08 +10:00 |
|
Rohan Mitchell
|
3dd4e074fc
|
Split spree variable changes into per-feature files, add an eaterprises feature for default layout
|
2013-04-22 16:12:50 +10:00 |
|
Rob H
|
3507c5414d
|
Changed Sass variable: back to our green colour following upgrade
|
2013-02-07 09:25:29 +11:00 |
|
Rob H
|
612017f143
|
WIP Upgrade to Spree 1.3
|
2013-02-05 15:01:45 +11:00 |
|
Rohan Mitchell
|
a013854d2d
|
Change logo to Eaterprises, update link colour to match
|
2012-09-14 11:25:36 +10:00 |
|