[Phpmyadmin-git] [phpmyadmin/scripts] 7ff5c2: Temporary fix attempt for demo page CSS

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/scripts
  Commit: 7ff5c21834216f078722716c9619c50dd5369613
      https://github.com/phpmyadmin/scripts/commit/7ff5c21834216f078722716c9619c50dd5369613
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-07-05 (Sun, 05 Jul 2015)

  Changed paths:
    A demo/css/slimbox.css
    A demo/css/style.css
    M demo/php/index.php

  Log Message:
  -----------
  Temporary fix attempt for demo page CSS

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


  Commit: 3930486c52bf980851c5656d2971eb884a6f4d07
      https://github.com/phpmyadmin/scripts/commit/3930486c52bf980851c5656d2971eb884a6f4d07
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-07-05 (Sun, 05 Jul 2015)

  Changed paths:
    M hooks/commits.php
    M hooks/create.php
    R website/pma-web

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


Compare: https://github.com/phpmyadmin/scripts/compare/71256065a52b...3930486c52bf