raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
3315191b814fbb84437964061a2dcfefcd2e0949
openfoodnetwork/app
History
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
..
assets
Merge branch 'local-organics'
2013-07-23 11:40:03 +10:00
controllers
Merge branch 'local-organics'
2013-07-23 11:40:03 +10:00
helpers
Move strip_html to main app, fixes context-sensitive chili feature spec fail
2013-07-22 16:21:32 +10:00
mailers
Move strip_html to main app, fixes context-sensitive chili feature spec fail
2013-07-22 16:21:32 +10:00
models
Merge branch 'local-organics'
2013-07-23 11:40:03 +10:00
overrides
Merge branch 'local-organics'
2013-07-23 11:40:03 +10:00
presenters
Simplify exchange products/variants JSON output format, bind angular to this
2013-01-10 10:59:53 +11:00
views
Merge branch 'local-organics'
2013-07-23 11:40:03 +10:00