[Buildbot-commits] [buildbot/buildbot] c1d4b2: Add a 'jinja_loaders' parameter to WebStatus for c...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: c1d4b2af6d25219cc119e1f296b37c85cad0e23f
      https://github.com/buildbot/buildbot/commit/c1d4b2af6d25219cc119e1f296b37c85cad0e23f
  Author: John Carr <john.carr at unrouted.co.uk>
  Date:   2012-06-05 (Tue, 05 Jun 2012)

  Changed paths:
    M master/buildbot/status/web/base.py
    M master/buildbot/status/web/baseweb.py
    M master/docs/manual/cfg-statustargets.rst

  Log Message:
  -----------
  Add a 'jinja_loaders' parameter to WebStatus for customizers who
want to use additional Jina2 loaders


  Commit: da08dff6fda652ff9393862d1f34c9fb0e176433
      https://github.com/buildbot/buildbot/commit/da08dff6fda652ff9393862d1f34c9fb0e176433
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-06-05 (Tue, 05 Jun 2012)

  Changed paths:
    M master/buildbot/status/web/base.py
    M master/buildbot/status/web/baseweb.py
    M master/docs/manual/cfg-statustargets.rst

  Log Message:
  -----------
  Merge commit 'refs/pull/442/head' of github.com:buildbot/buildbot

Conflicts:
	master/docs/manual/cfg-statustargets.rst


Compare: https://github.com/buildbot/buildbot/compare/44d9b40...da08dff