Maikel Linke 68f3d0951a Merge branch 'groups' into indicate-required-fields-for-new-enterprise-form ...

Conflicts:
	app/views/admin/enterprises/_new_form.html.haml

2016-02-24 15:36:25 +11:00

..

assets

Introduce contact email address for enterprises

2016-02-24 15:14:07 +11:00

controllers

Merge remote-tracking branch 'origin/master' into discourse-sso

2016-02-19 11:02:59 +11:00

helpers

Replace with-tip with ofn-with-tip: misc

2016-02-24 11:26:37 +11:00

jobs

Formatting dates for account invoices in rails time zone

2015-12-17 11:34:06 +11:00

mailers

Cleaning up and attempt to add feature spec

2016-01-15 09:07:49 +11:00

models

Introduce contact email address for enterprises

2016-02-24 15:14:07 +11:00

overrides

Replace with-tip with ofn-with-tip: misc

2016-02-24 11:26:37 +11:00

presenters

Admin can set enterprise fee's tax category

2015-03-05 10:44:25 +11:00

serializers/api

Introduce contact email address for enterprises

2016-02-24 15:14:07 +11:00

views

Merge branch 'groups' into indicate-required-fields-for-new-enterprise-form

2016-02-24 15:36:25 +11:00