Merge branch 'migrate_ent_types' into bugfix

Conflicts:
	app/models/spree/ability_decorator.rb
This commit is contained in:
Rafael Schouten
2014-10-18 07:37:41 +11:00
105 changed files with 490 additions and 2653 deletions

View File

@@ -1,4 +1,5 @@
angular.module("admin.enterprises")
# Populate Enterprise.enterprise with enterprise json array from the page.
.factory 'Enterprise', (enterprise) ->
new class Enterprise
enterprise: enterprise
enterprise: enterprise