Maikel Linke 02cbad2697 Remove duplicate lines from merging

2016-03-09 18:49:35 +11:00

..

assets

Add brackets to t call in js line items controller

2016-03-09 18:39:23 +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

Remove duplicate lines from merging

2016-03-09 18:49:35 +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

Display receival instructions when editing order cycle

2016-01-29 12:17:20 +11:00

views

Remove duplicate lines from merging

2016-03-09 18:49:35 +11:00