← Back to branch summary

~notnownikki/offspring/post-build-script

~notnownikki/offspring/post-build-script

Viewing all changes in revision 96.7.6.

Committer: Kevin McDermott
Date: 2012-01-20 17:26:38 UTC
mfrom: (118 offspring)
mto: This revision was merged to the branch mainline in revision 121.
Revision ID: kevin@canonical.com-20120120172638-w27qwbgtq0r048d5

Merge trunk.

files modified:
Makefile

lib/offspring/master/models.py

lib/offspring/master/notifications.py

lib/offspring/master/tests/helpers.py

lib/offspring/master/tests/test_notifications.py

lib/offspring/web/queuemanager/models.py

lib/offspring/web/queuemanager/tests/helpers.py

lib/offspring/web/queuemanager/tests/test_managers.py

lib/offspring/web/templates/queuemanager/project_details.html

Show diffs side-by-side

added added

removed removed

lib/offspring/master/models.py

lib/offspring/master/notifications.py

lib/offspring/master/tests/helpers.py

lib/offspring/master/tests/test_notifications.py

lib/offspring/web/queuemanager/models.py

lib/offspring/web/queuemanager/tests/helpers.py

lib/offspring/web/queuemanager/tests/test_managers.py

lib/offspring/web/templates/queuemanager/project_details.html

Older »