mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Automated merge with http://waqas.ath.cx/

Browse source
This commit is contained in:
Matthew Wild 2008-12-03 17:24:20 +00:00
commit 96a4cbc2a7
4 changed files with 839 additions and 864 deletions
Download patch file Download diff file Expand all files Collapse all files

6
HACKERS
View file

@ -1,7 +1,5 @@
Welcome hackers!
This project accepts and *encourages* contributions. If you would like to get involved you can join us on our mailing list at: <doh, we need a mailing list>
This project accepts and *encourages* contributions. If you would like to get involved you can join us on our mailing list and discussion rooms. More information on these at http://prosody.im/discuss
You can also find us in the chatroom at lxmppd@conference.heavy-horse.co.uk
Patches are welcome, though before sending we would appreciate if you read docs/coding_style.txt for guidelines on how to format your code.
Patches are welcome, though before sending we would appreciate if you read docs/coding_style.txt for guidelines on how to format your code, and are comfortable with copyright of contributions being assigned to the core developers.

1694
net/server.lua
View file

File diff suppressed because it is too large Load diff

1
prosody.cfg.lua.dist
View file

@ -75,4 +75,3 @@ Host "example.com"
}
enabled = false -- This will disable the host, preserving the config, but denying connections
>>>>>>> other

2
util/dependencies.lua
View file

@ -33,7 +33,7 @@ local function missingdep(name, sources, msg)
end
print("");
print(msg or (name.." is required for Prosody to run, so we will now exit."));
print("More help can be found on our website, at http://.../doc/depends");
print("More help can be found on our website, at http://prosody.im/doc/depends");
print("**************************");
print("");
end