Rafael Schouten 1aa80e53b1 Merge branch 'master' into currency ...

Conflicts:
	app/helpers/injection_helper.rb
	db/suburb_seeds.rb

2014-09-16 10:25:22 +10:00

..

controllers

Fix broken JS specs

2014-08-19 16:47:51 +10:00

filters

add spree currency helper, fix some typos and specs

2014-09-11 11:47:55 +10:00

services

Merge branch 'master' into currency

2014-09-16 10:25:22 +10:00