github.com/processone/ejabberd.git - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update copyright date automatically (#1442)	Badlop	2017-01-02	1	-1/+1
\|
*	Merge branch 'master' into xml-ng	Evgeniy Khramtsov	2016-11-12	1	-3/+3
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Add missing comas in sql statement (#1219)	Christophe Romain	2016-08-01	1	-3/+3
\| \|
* \|	Improve pubsub code	Evgeniy Khramtsov	2016-09-08	1	-9/+9
\|/
*	Quote reserver 'type' keyword for pgsql to fix e300f80	Christophe Romain	2016-07-05	1	-2/+2
\|
*	Fix use of like parameter in sql pubsub's requests	Christophe Romain	2016-07-05	1	-14/+22
\|
*	Stronger tests in the test suite, SQL updates and fixes	Alexey Shchepin	2016-06-02	1	-61/+60
\|
*	Update SQL escaping	Alexey Shchepin	2016-05-13	1	-4/+4
\|
*	Rename odbc to sql everywhere	Evgeniy Khramtsov	2016-04-20	1	-0/+314