Rohan Mitchell cbe46bffed Merge branch 'bpe_paginate' ...

Conflicts:
	config/ng-test.conf.js

2014-01-09 12:07:42 +11:00

..

assets

Merge branch 'bpe_paginate'

2014-01-09 12:07:42 +11:00

controllers

Merge branch 'bpe_paginate'

2014-01-09 12:07:42 +11:00

helpers

Merging from master

2013-12-17 14:18:21 +11:00

mailers

Fixing some breaking bugs in the refactored mailer

2013-12-13 15:40:23 +11:00

models

Merge branch 'bpe_paginate'

2014-01-09 12:07:42 +11:00

overrides

Remove reference to deleted stylesheet

2013-12-17 12:48:44 +11:00

presenters

Simplify exchange products/variants JSON output format, bind angular to this

2013-01-10 10:59:53 +11:00

views

Merge branch 'bpe_paginate'

2014-01-09 12:07:42 +11:00