]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - actions/tagrss.php
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b2664e1 538dcf2)
Merge branch 'dbconfig' into 0.9.x
authorEvan Prodromou <evan@controlyourself.ca>
Fri, 21 Aug 2009 20:17:06 +0000 (16:17 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Fri, 21 Aug 2009 20:17:06 +0000 (16:17 -0400)
commit8236037bf0bff51d4bc623646454f39eec4bc6ec
treeea895bd201a379e7cda2a7587ec862c46aeb3408tree | snapshot
parentb2664e1ae2e2cf66585cdd8696d88efdd053eb3bcommit | diff
parent538dcf2eefd2742f698cb812ae90c10971ef5e75commit | diff
Merge branch 'dbconfig' into 0.9.x

Conflicts:
lib/common.php
lib/common.php diff1 | diff2 | blob | history
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)