Skip to content

Commit

Permalink
Merge commit 'efc31f82990b385be67c37a704fe523a0d7d4a61' into jinja
Browse files Browse the repository at this point in the history 
web/tests.py removed from jinja branch earlier. Ignoring edits.

Conflicts:
	buildbot/status/web/tests.py
  • Loading branch information
@marcus-sonestedt
marcus-sonestedt committed Dec 19, 2009
2 parents 87623a3 + efc31f8 commit 014b63a
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 014b63a

Please sign in to comment.