6 Commits

Author	SHA1	Message	Date
Evgeniy Khramtsov	d5d906184f	Merge branch 'new_stream' ... Conflicts: src/cyrsasl.erl src/ejabberd_c2s.erl src/ejabberd_cluster.erl src/ejabberd_frontend_socket.erl src/ejabberd_node_groups.erl src/ejabberd_router.erl src/mod_bosh.erl src/mod_ip_blacklist.erl src/mod_muc_mnesia.erl src/mod_offline.erl src/mod_proxy65_sm.erl	2017-01-20 19:35:46 +03:00
Badlop	5fdd1c39fe	Update copyright date automatically (#1442)	2017-01-02 21:42:06 +01:00
Evgeniy Khramtsov	3dd2a614ac	Get rid of "jlib.hrl" header in some files	2017-01-02 14:45:52 +03:00
Evgeniy Khramtsov	49f1275e20	Get rid of excessive (io)list_to_binary/1 calls	2016-11-24 15:06:06 +03:00
Evgeniy Khramtsov	6f2f1e87c9	Don't use deprecated functions from jlib.erl	2016-11-23 10:41:26 +03:00
Paweł Chmielowski	ebadcf71c2	New bosh module	2016-11-22 15:26:15 +01:00