diff options
| author | Rob Van Dam <rvandam00@gmail.com> | 2013-11-07 15:27:24 -0700 |
|---|---|---|
| committer | Rob Van Dam <rvandam00@gmail.com> | 2013-11-07 15:27:24 -0700 |
| commit | df1ebf662a9fc3f89503036e0dbf6833c1b95f9e (patch) | |
| tree | f62eafd9d77427277e6aaa4353fb3bf8567926fd /FS/MANIFEST | |
| parent | 45cd27b19e8ad50f835915746fb89e486cbb69c0 (diff) | |
| parent | a180208786cccb72ab017e39fff0cb128aa6ba01 (diff) | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
FS/FS/cust_pkg.pm
Diffstat (limited to 'FS/MANIFEST')
| -rw-r--r-- | FS/MANIFEST | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/FS/MANIFEST b/FS/MANIFEST index 7a460dac3..e63583118 100644 --- a/FS/MANIFEST +++ b/FS/MANIFEST @@ -1,6 +1,5 @@ Changes MANIFEST -MANIFEST.SKIP Makefile.PL bin/freeside-addoutsource bin/freeside-addoutsourceuser @@ -728,3 +727,5 @@ FS/cable_provider.pm t/cable_provider.t FS/cust_credit_void.pm t/cust_credit_void.t +FS/discount_class.pm +t/discount_class.t |