diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2013-12-10 20:59:42 -0800 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2013-12-10 20:59:42 -0800 |
| commit | 430b2c784d2ee9ea5be00b821d2dbd27279ef132 (patch) | |
| tree | c8a224219c1425bd3fa03b1a54487bf1f3de7449 /FS/MANIFEST | |
| parent | 6ced51db0e73603461591e54b7f606467e7c7af0 (diff) | |
| parent | e1157f37c618a7b9cdb2793d61999458076dc51b (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Conflicts:
FS/FS/Mason.pm
FS/MANIFEST
Diffstat (limited to 'FS/MANIFEST')
| -rw-r--r-- | FS/MANIFEST | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/FS/MANIFEST b/FS/MANIFEST index ba933996d..1f2dfccc4 100644 --- a/FS/MANIFEST +++ b/FS/MANIFEST @@ -735,3 +735,5 @@ FS/alarm_type.pm t/alarm_type.t FS/alarm_station.pm t/alarm_station.t +FS/addr_range.pm +t/addr_range.t |