summaryrefslogtreecommitdiff
path: root/ng_selfservice/js
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2013-10-08 23:00:26 -0700
committerIvan Kohler <ivan@freeside.biz>2013-10-08 23:00:26 -0700
commitfe4515eb37d76849dd08c62782d86bc7ba311dcd (patch)
tree6952cc3598de0c72b6a3eab1d53bde07a16c27f2 /ng_selfservice/js
parentf2766e203e1aa144d046a26cf13e01e1f5b00f64 (diff)
parent81ae0992cf8506c6a77485548ebde25eb946a9a9 (diff)
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Conflicts: FS/FS/cust_main.pm
Diffstat (limited to 'ng_selfservice/js')
-rw-r--r--ng_selfservice/js/.menu.js.swpbin12288 -> 0 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/ng_selfservice/js/.menu.js.swp b/ng_selfservice/js/.menu.js.swp
deleted file mode 100644
index 8df94a9c4..000000000
--- a/ng_selfservice/js/.menu.js.swp
+++ /dev/null
Binary files differ