Skip to content
  • Penny Leach's avatar
    Merge branch 'dwoo' · 3c44a80e
    Penny Leach authored
    Conflicts:
    	htdocs/lib/web.php
    
    Inaki's patch had changed the smarty function to add httpswwwroot.  I
    moved this to lib/dwoo/mahara/Dwoo_Mahara.php
    3c44a80e