projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
0475c98
)
Merge branch 'configdb' of ssh://git.citadel.org/appl/gitroot/citadel
author
Wilfried Goesgens
<dothebart@citadel.org>
Sun, 16 Aug 2015 10:25:07 +0000
(12:25 +0200)
committer
Wilfried Goesgens
<dothebart@citadel.org>
Sun, 16 Aug 2015 10:25:07 +0000
(12:25 +0200)
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
No differences found
projects / citadel.git / commitdiff