-
Committer:
Daniel Holbach
-
Date:
2009-12-23 11:21:21 UTC
-
mto:
This revision was merged to the branch mainline in
revision
15.
-
Revision ID:
daniel.holbach@canonical.com-20091223112121-t63f2ssj03p0rdg3
merged lp:~doctormo/loco-directory/teams_page_design - resolved conflict in loco_directory/templates/base.html, updated AUTHORS file, updated translations template