Rohan Mitchell d908701b59 Merge branch 'master' into folklabs-producer-emails ...

Conflicts:
	Gemfile

2015-06-11 17:02:34 +10:00

..

assets

Auto-merge from CI [skip ci]

2015-06-04 15:39:43 +10:00

controllers

Merge branch 'master' into folklabs-producer-emails

2015-06-11 17:02:34 +10:00

helpers

Merge branch 'master' into customers

2015-06-03 15:19:40 +08:00

jobs

Avoid serialising entire order cycle when enqueuing OrderCycleNotificationJob

2015-04-29 15:21:05 +10:00

mailers

#275: Insert receival time and instructions into email.

2015-05-24 10:38:49 +01:00

models

Merge branch 'master' into folklabs-producer-emails

2015-06-11 17:02:34 +10:00

overrides

Only record analytics in production. Also record them in admin backend.

2015-06-03 16:36:31 +10:00

presenters

Admin can set enterprise fee's tax category

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

serializers/api

Merge branch 'master' into customers

2015-06-03 15:19:40 +08:00

views

Merge branch 'master' into folklabs-producer-emails

2015-06-11 17:02:34 +10:00