4 commits

Author	SHA1	Message	Date
Joachim Schiele	9d5431d1a2	Merge pull request #4536 from flosse/prosody ... prosody: updated to v0.9.5	2014-10-15 09:41:48 +02:00
Markus Kohlhase	0f3f017f3e	prosody: updated to v0.9.5	2014-10-15 04:11:24 +02:00
Markus Kohlhase	5308d3284b	prosody: added websocket support	2014-10-15 03:57:00 +02:00
Markus Kohlhase	d86c2c30c5	prosody: packaged as a service ... Conflicts: nixos/modules/misc/ids.nix	2014-10-11 18:53:43 +02:00