MDL-14591: fixing merge issues in portfolio
authormjollnir_ <mjollnir_>
Fri, 25 Jul 2008 08:31:59 +0000 (08:31 +0000)
committermjollnir_ <mjollnir_>
Fri, 25 Jul 2008 08:31:59 +0000 (08:31 +0000)
commitd6d24b8884f41a1dc8edc7efa0cc7c264a350f5f
treebaeb87787eff8ff5ea00546e30463191cc8d502f
parentd255c6e9ad407b155e43891c7c460a5c0fd2a224
MDL-14591: fixing merge issues in portfolio
user/portfolio.php
user/tabs.php