diff options
author | Matthew Wild <mwild1@gmail.com> | 2014-04-02 17:41:38 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2014-04-02 17:41:38 +0100 |
commit | da820882348572de470a13a1a50f529a51243aa5 (patch) | |
tree | 39ca42dddf3935546a0c3c37b2e2456a554899f1 /net/server.lua | |
parent | 618661cda2a68afbe445ce079c15af25bdaa177b (diff) | |
parent | f7d4b04bf17c8b634eae00e814a995a88c5ba6cb (diff) | |
download | prosody-da820882348572de470a13a1a50f529a51243aa5.tar.gz prosody-da820882348572de470a13a1a50f529a51243aa5.zip |
Merge 0.9->0.10
Diffstat (limited to 'net/server.lua')
-rw-r--r-- | net/server.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/server.lua b/net/server.lua index 375e7081..2a0b89ae 100644 --- a/net/server.lua +++ b/net/server.lua @@ -1,7 +1,7 @@ -- Prosody IM -- Copyright (C) 2008-2010 Matthew Wild -- Copyright (C) 2008-2010 Waqas Hussain --- +-- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information. -- |