← Back to branch summary

~salgado/offspring/project-ssh-key-ui

~salgado/offspring/project-ssh-key-ui

Viewing all changes in revision 118.

Committer: Guilherme Salgado
Date: 2012-01-13 18:57:32 UTC
mfrom: (93.2.22 trunk)
Revision ID: salgado@canonical.com-20120113185732-y8cm5dgetdf18r2t

Merge trunk

files modified:
lib/offspring/web/queuemanager/management/commands/build_metrics.py

lib/offspring/web/queuemanager/management/commands/tests/test_build_metrics.py

lib/offspring/web/queuemanager/metrics.py

lib/offspring/web/queuemanager/models.py

lib/offspring/web/queuemanager/templatetags/lexbuilder_sidebars.py

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

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

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

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

Show diffs side-by-side

added added

removed removed

lib/offspring/web/queuemanager/management/commands/build_metrics.py

lib/offspring/web/queuemanager/management/commands/tests/test_build_metrics.py

lib/offspring/web/queuemanager/metrics.py

lib/offspring/web/queuemanager/models.py

lib/offspring/web/queuemanager/templatetags/lexbuilder_sidebars.py

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

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

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

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

Older »