projects / citadel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 30a4090 24b719c)
Merge branch 'configdb' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sun, 16 Aug 2015 10:25:07 +0000 (12:25 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 16 Aug 2015 10:25:07 +0000 (12:25 +0200)
commit0475c981817d12900332693297a77a9ae7168129
treec186b264fa8028a8415db342301f9c1379d679fftree | snapshot
parent30a4090b04dff1084df3789efe78afd1e2bf6d90commit | diff
parent24b719cd6499434d34324c1aff2313bb7d29afeacommit | diff
Merge branch 'configdb' of ssh://git.citadel.org/appl/gitroot/citadel

Conflicts:
citadel/citserver.c
citadel/config.c
citadel/control.c
citadel/modules/fulltext/serv_fulltext.c
citadel/modules/migrate/serv_migrate.c
citadel/modules/upgrade/serv_upgrade.c
citadel/server.h
29 files changed:
citadel/config.c diff1 | diff2 | blob | history
citadel/control.c diff1 | diff2 | blob | history
citadel/database.c diff1 | diff2 | blob | history
citadel/ical_dezonify.c diff1 | diff2 | blob | history
citadel/include/ctdl_module.h diff1 | diff2 | blob | history
citadel/modules/autocompletion/serv_autocompletion.c diff1 | diff2 | blob | history
citadel/modules/calendar/serv_calendar.c diff1 | diff2 | blob | history
citadel/modules/ctdlproto/serv_messages.c diff1 | diff2 | blob | history
citadel/modules/expire/serv_expire.c diff1 | diff2 | blob | history
citadel/modules/extnotify/extnotify_main.c diff1 | diff2 | blob | history
citadel/modules/fulltext/serv_fulltext.c diff1 | diff2 | blob | history
citadel/modules/imap/imap_fetch.c diff1 | diff2 | blob | history
citadel/modules/imap/imap_search.c diff1 | diff2 | blob | history
citadel/modules/migrate/serv_migrate.c diff1 | diff2 | blob | history
citadel/modules/network/serv_netmail.c diff1 | diff2 | blob | history
citadel/modules/network/serv_netspool.c diff1 | diff2 | blob | history
citadel/modules/network/serv_network.c diff1 | diff2 | blob | history
citadel/modules/nntp/serv_nntp.c diff1 | diff2 | blob | history
citadel/modules/pop3client/serv_pop3client.c diff1 | diff2 | blob | history
citadel/modules/rssclient/serv_rssclient.c diff1 | diff2 | blob | history
citadel/modules/sieve/serv_sieve.c diff1 | diff2 | blob | history
citadel/modules/smtp/serv_smtp.c diff1 | diff2 | blob | history
citadel/modules/smtp/serv_smtpqueue.c diff1 | diff2 | blob | history
citadel/modules/vcard/serv_vcard.c diff1 | diff2 | blob | history
citadel/modules/wiki/serv_wiki.c diff1 | diff2 | blob | history
citadel/modules/xmpp/xmpp_presence.c diff1 | diff2 | blob | history
citadel/msgbase.c diff1 | diff2 | blob | history
citadel/room_ops.c diff1 | diff2 | blob | history
citadel/server_main.c diff1 | diff2 | blob | history
Citadel server, clients, utilities