[Phpmyadmin-git] [phpmyadmin/website] ab4cd6: Add combined Platinum + Gold choices

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/website
  Commit: ab4cd6eaf25ac13364cf33887bb563f94c38bd82
      https://github.com/phpmyadmin/website/commit/ab4cd6eaf25ac13364cf33887bb563f94c38bd82
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-06-13 (Fri, 13 Jun 2014)

  Changed paths:
    M templates/sponsors.tpl

  Log Message:
  -----------
  Add combined Platinum + Gold choices

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 8e76ef2fdd52759e74862c7dc4c037d77a20d3b1
      https://github.com/phpmyadmin/website/commit/8e76ef2fdd52759e74862c7dc4c037d77a20d3b1
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-06-13 (Fri, 13 Jun 2014)

  Changed paths:
    A images/scrutinizer.png
    M render.py
    M templates/15-years.tpl
    M templates/about-website.tpl
    M templates/about.tpl
    M templates/search.tpl
    M templates/sponsors.tpl
    M templates/support.tpl

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/website


Compare: https://github.com/phpmyadmin/website/compare/a20b7f524eb8...8e76ef2fdd52