[Phpmyadmin-git] [phpmyadmin/website] 30797f: Avoid name clash

[Michal Čihař]

  Branch: refs/heads/django
  Home:   https://github.com/phpmyadmin/website
  Commit: 30797fe3f8e446601464c23a6c5736dfe6f2bd65
      https://github.com/phpmyadmin/website/commit/30797fe3f8e446601464c23a6c5736dfe6f2bd65
  Author: Michal Čihař <michal at cihar.com>
  Date:   2015-06-26 (Fri, 26 Jun 2015)

  Changed paths:
    M pmaweb/context_processors.py

  Log Message:
  -----------
  Avoid name clash

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 5bdd3b5b7537a9f84475401602a88f815314ee80
      https://github.com/phpmyadmin/website/commit/5bdd3b5b7537a9f84475401602a88f815314ee80
  Author: Michal Čihař <michal at cihar.com>
  Date:   2015-06-26 (Fri, 26 Jun 2015)

  Changed paths:
    M TODO
    M pmaweb/templates/base.html
    R pmaweb/templates/sitemap.html
    M pmaweb/urls.py
    M pmaweb/views.py

  Log Message:
  -----------
  Remove HTML sitemap

It is really not useful, search engines now rely on XML one.

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 33a2b283a63f4c515bd2eeab2fe44b7294e9ea2f
      https://github.com/phpmyadmin/website/commit/33a2b283a63f4c515bd2eeab2fe44b7294e9ea2f
  Author: Michal Čihař <michal at cihar.com>
  Date:   2015-06-26 (Fri, 26 Jun 2015)

  Changed paths:
    M pmaweb/urls.py

  Log Message:
  -----------
  Handle favicon.ico in toplevel dir

Signed-off-by: Michal Čihař <michal at cihar.com>


Compare: https://github.com/phpmyadmin/website/compare/4fa0c95c65db...33a2b283a63f