Merge branch '3.x-pre' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH

diff --git a/FS/FS.pm b/FS/FS.pm
index e2d54d6..6c7fb04 100644 (file)
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -3,7 +3,7 @@ package FS;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '3.7git';
+$VERSION = '3.8git';
 
 #find missing entries in this file with:
 # for a in `ls *pm | cut -d. -f1`; do grep 'L<FS::'$a'>' ../FS.pm >/dev/null || echo "missing $a" ; done

diff --git a/debian/changelog b/debian/changelog
index c04ae77..bc8ca7b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+freeside (3.8git~20150626-1) UNRELEASED; urgency=low
+
+  * Testing version of freeside.
+
+ -- Jeremy Davis <jeremyd-debian@freeside.biz>  Fri, 26 Jun 2015 18:04:36 -0500
+
 freeside (3.7git~20150221-1) UNRELEASED; urgency=low
 
   * Testing version of freeside.

diff --git a/debian/freeside-ng-selfservice.conffiles b/debian/freeside-ng-selfservice.conffiles
new file mode 100644 (file)
index 0000000..58f0d3a
--- /dev/null
+++ b/debian/freeside-ng-selfservice.conffiles
@@ -0,0 +1 @@
+/var/www/ng_selfservice-DIST/freeside.class.php

diff --git a/debian/freeside-torrus.conffiles b/debian/freeside-torrus.conffiles
new file mode 100644 (file)
index 0000000..54116b2
--- /dev/null
+++ b/debian/freeside-torrus.conffiles
@@ -0,0 +1 @@
+/usr/local/etc/torrus/conf/torrus-siteconfig.pl

diff --git a/httemplate/misc/process/nms-add_iface.html b/httemplate/misc/process/nms-add_iface.html
index d21b379..79e6856 100644 (file)
--- a/httemplate/misc/process/nms-add_iface.html
+++ b/httemplate/misc/process/nms-add_iface.html
@@ -1,4 +1,4 @@
-<& /elements/header-popup.html, 'Interface added') &>
+<& /elements/header-popup.html, 'Interface added' &>
 <SCRIPT TYPE="text/javascript">
   window.top.location.reload();
 </SCRIPT>