summaryrefslogtreecommitdiff
path: root/theme
diff options
context:
space:
mode:
authorRobin Millette <millette@controlyourself.ca>2009-04-17 17:04:05 +0000
committerRobin Millette <millette@controlyourself.ca>2009-04-17 17:04:05 +0000
commite5094c3359fb74caeea474f8e08eb0d15b477652 (patch)
tree9d60785414e80a5bad75e3e45ab542a0c9f0352b /theme
parent55d7bb4701ca39fb8f4b859b19defdfc7af0142c (diff)
parent2eb1eb86838b47af7305dbd21a181e63bcd58418 (diff)
fix merge conflict 0.7.x 0.8.x in util.php and register.php.
Diffstat (limited to 'theme')
0 files changed, 0 insertions, 0 deletions