Will Marshall 20d7484134 Merge branch 'master' into laura_and_will ...

Conflicts:
	app/assets/javascripts/darkswarm/services/order.js.coffee

2014-07-28 13:43:31 +10:00

..

shopping

Merge branch 'master' into laura_and_will

2014-07-28 13:43:31 +10:00

authentication_spec.rb

Fixing bugs and spec regressions

2014-07-24 16:02:10 +10:00

cms_spec.rb

Disabling CMS specs

2014-03-19 15:19:15 +11:00

groups_spec.rb

Dereferencing groups and adding modals to page

2014-06-24 17:15:31 +10:00

home_spec.rb

Further minor regressions

2014-07-28 13:41:38 +10:00

producers_spec.rb

Further patching regression

2014-07-11 17:55:06 +10:00

suppliers_spec.rb

Removing dud specs from suppliers spec

2014-03-19 14:25:13 +11:00