summaryrefslogtreecommitdiff
path: root/misc/freeswitch/scripts/configuration/sip.lua
diff options
context:
space:
mode:
authorspag <spag@golwen.net>2013-01-18 14:23:43 +0100
committerspag <spag@golwen.net>2013-01-18 14:23:43 +0100
commit5d535a508d9e84cbaf3cb8b5a21797f94b38f9ab (patch)
tree099438f250c56a1bcac404c82a0271c14a1a98ac /misc/freeswitch/scripts/configuration/sip.lua
parent6994ba4b5fecc2d532770f922d76227a175e3d71 (diff)
parent8b37b125399ba4019091b83efe889dc8af89185f (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
Conflicts: misc/freeswitch/scripts/ini/routes.ini
Diffstat (limited to 'misc/freeswitch/scripts/configuration/sip.lua')
-rw-r--r--misc/freeswitch/scripts/configuration/sip.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/misc/freeswitch/scripts/configuration/sip.lua b/misc/freeswitch/scripts/configuration/sip.lua
index 4679aae..6f5b204 100644
--- a/misc/freeswitch/scripts/configuration/sip.lua
+++ b/misc/freeswitch/scripts/configuration/sip.lua
@@ -1,5 +1,5 @@
-- Gemeinschaft 5 module: sip configuration class
--- (c) AMOOMA GmbH 2012
+-- (c) AMOOMA GmbH 2012-2013
--
module(...,package.seeall)