Merge branch 'ent_types_frontend' into migrate_ent_types

Browse Source

Conflicts:
	app/models/enterprise.rb

...

This commit is contained in:

Rafael Schouten

2014-10-01 16:10:43 +10:00

parent fa41f6dc40 c91d707806

commit 1ec4f2e456

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available