-
Committer:
Daniel Holbach
-
Date:
2009-12-23 10:46:34 UTC
-
mfrom:
(116.2.7 new-design)
-
Revision ID:
daniel.holbach@canonical.com-20091223104634-9phwsecigd3y5wap
merged lp:~doctormo/loco-directory/teams_page_design - resolved conflict in loco_directory/templates/base.html, updated AUTHORS file, updated translations template