summaryrefslogtreecommitdiff
path: root/doc-src
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-08-21 16:17:06 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-08-21 16:17:06 -0400
commit8236037bf0bff51d4bc623646454f39eec4bc6ec (patch)
treeea895bd201a379e7cda2a7587ec862c46aeb3408 /doc-src
parentb2664e1ae2e2cf66585cdd8696d88efdd053eb3b (diff)
parent538dcf2eefd2742f698cb812ae90c10971ef5e75 (diff)
Merge branch 'dbconfig' into 0.9.x
Conflicts: lib/common.php
Diffstat (limited to 'doc-src')
0 files changed, 0 insertions, 0 deletions