Evgeniy Khramtsov 78a44e0176 Merge branch 'master' into xml-ng ... Conflicts: src/adhoc.erl src/cyrsasl_oauth.erl src/ejabberd_c2s.erl src/ejabberd_config.erl src/ejabberd_service.erl src/gen_mod.erl src/mod_admin_extra.erl src/mod_announce.erl src/mod_carboncopy.erl src/mod_client_state.erl src/mod_configure.erl src/mod_echo.erl src/mod_mam.erl src/mod_muc.erl src/mod_muc_room.erl src/mod_offline.erl src/mod_pubsub.erl src/mod_stats.erl src/node_flat_sql.erl src/randoms.erl		2016-11-12 13:27:15 +03:00
..
flex_offline.cfg	Add xdata generator and make some code using it	2016-10-07 10:31:03 +03:00
flex_offline.xdata	Add xdata generator and make some code using it	2016-10-07 10:31:03 +03:00
muc_register.cfg	Add xdata generator and make some code using it	2016-10-07 10:31:03 +03:00
muc_register.xdata	Add xdata generator and make some code using it	2016-10-07 10:31:03 +03:00
muc_request.cfg	Add xdata generator and make some code using it	2016-10-07 10:31:03 +03:00
muc_request.xdata	Add xdata generator and make some code using it	2016-10-07 10:31:03 +03:00
muc_roomconfig.cfg	Add xdata generator and make some code using it	2016-10-07 10:31:03 +03:00
muc_roomconfig.xdata	Add xdata generator and make some code using it	2016-10-07 10:31:03 +03:00
muc_roominfo.cfg	Add xdata generator and make some code using it	2016-10-07 10:31:03 +03:00
muc_roominfo.xdata	Add xdata generator and make some code using it	2016-10-07 10:31:03 +03:00
pubsub_get_pending.cfg	Add xdata generator and make some code using it	2016-10-07 10:31:03 +03:00
pubsub_get_pending.xdata	Add xdata generator and make some code using it	2016-10-07 10:31:03 +03:00
pubsub_node_config.cfg	Add xdata generator and make some code using it	2016-10-07 10:31:03 +03:00
pubsub_node_config.xdata	Add xdata generator and make some code using it	2016-10-07 10:31:03 +03:00
pubsub_publish_options.cfg	Add xdata generator and make some code using it	2016-10-07 10:31:03 +03:00
pubsub_publish_options.xdata	Add xdata generator and make some code using it	2016-10-07 10:31:03 +03:00
pubsub_subscribe_authorization.cfg	Add xdata generator and make some code using it	2016-10-07 10:31:03 +03:00
pubsub_subscribe_authorization.xdata	Add xdata generator and make some code using it	2016-10-07 10:31:03 +03:00
pubsub_subscribe_options.cfg	Add xdata generator and make some code using it	2016-10-07 10:31:03 +03:00
pubsub_subscribe_options.xdata	Add xdata generator and make some code using it	2016-10-07 10:31:03 +03:00
xmpp_codec.spec	Merge branch 'master' into xml-ng	2016-11-12 13:27:15 +03:00