Rafael Schouten 20a94b4365 Merge branch 'master' into migrate_ent_types ...

Conflicts:
	app/serializers/api/admin/enterprise_serializer.rb

2014-10-07 10:52:26 +11:00

..

unit

Merge branch 'master' into migrate_ent_types

2014-10-07 10:52:26 +11:00

application_spec.js

specs - add text angular dep and long descrioption provider

2014-10-03 16:42:37 +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