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

..

unit

Merge branch 'master' into currency

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

application_spec.js

Fix broken JS specs

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

mock_google_maps.js.coffee

Reworking the RABL templates for simplicity AND fixing up all the tests

2014-06-18 13:05:44 +10:00