diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-03-20 14:17:51 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-03-20 14:17:51 +0000 |
| commit | fc48cf2a70ea426b7b5ffec3f2719085c0550659 (patch) | |
| tree | 08adeaa9739914324872fb61ca7511b9a2e6632d | |
| parent | 44cd7c769cafd37edb8a74293024bbf6472077c8 (diff) | |
| parent | c4bb05ab3e6699e5c367cc4cc698f7473b106a9b (diff) | |
| download | prosody-fc48cf2a70ea426b7b5ffec3f2719085c0550659.tar.gz prosody-fc48cf2a70ea426b7b5ffec3f2719085c0550659.zip | |
Merge 0.7->trunk
| -rw-r--r-- | .hgignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -6,6 +6,7 @@ www_files html/* prosody.lua prosody.cfg.lua +prosody.version config.unix *.patch *.orig |