1. 17 Nov, 2009 1 commit
    • Richard Mansfield's avatar
      Merge branch 'master' into view-themes · e0a037c3
      Richard Mansfield authored
      Conflicts:
      
      	htdocs/lang/en.utf8/admin.php
      	htdocs/lang/en.utf8/mahara.php
      	htdocs/lib/db/upgrade.php
      	htdocs/lib/version.php
      	htdocs/theme/raw/static/style/style.css
      	htdocs/theme/raw/templates/microheader.tpl
      	htdocs/theme/raw/templates/user/view.tpl
      	htdocs/theme/raw/templates/view/blocks.tpl
      	htdocs/theme/raw/templates/view/view.tpl
      	htdocs/theme/raw/templates/viewmicroheader.tpl
      	htdocs/theme/views.css
      	htdocs/view/blocks.php
      	htdocs/view/view.php
      e0a037c3
  2. 16 Nov, 2009 8 commits
  3. 15 Nov, 2009 5 commits
  4. 13 Nov, 2009 1 commit
  5. 12 Nov, 2009 1 commit
  6. 11 Nov, 2009 3 commits
  7. 10 Nov, 2009 4 commits
  8. 09 Nov, 2009 4 commits
  9. 06 Nov, 2009 2 commits
  10. 05 Nov, 2009 3 commits
  11. 04 Nov, 2009 5 commits
  12. 03 Nov, 2009 3 commits