[Phpmyadmin-git] [phpmyadmin/website] 1c6cc6: Remove 2014 contest info

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/website
  Commit: 1c6cc6d729be0afcfd8d68b52c05074fe748bca6
      https://github.com/phpmyadmin/website/commit/1c6cc6d729be0afcfd8d68b52c05074fe748bca6
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-03-30 (Sun, 30 Mar 2014)

  Changed paths:
    M data/menu.py
    M templates/_littleboxes.tpl
    R templates/contest.tpl

  Log Message:
  -----------
  Remove 2014 contest info

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


  Commit: 198117de2283413f086820912225cb05f9fc9230
      https://github.com/phpmyadmin/website/commit/198117de2283413f086820912225cb05f9fc9230
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-03-30 (Sun, 30 Mar 2014)

  Changed paths:
    R images/vds64_200x68.png
    M render.py
    M templates/security/PMASA-2004-4
    M templates/security/PMASA-2013-1
    A templates/security/PMASA-2014-1
    M templates/sponsors.tpl

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


Compare: https://github.com/phpmyadmin/website/compare/d8bdfd590c3f...198117de2283