Viewing all changes in revision 3.1.4.
- 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
- files added:
- loco_directory/media/img/back-to-teams.png
- loco_directory/media/img/box
- loco_directory/media/img/res
- sources
- files modified:
- AUTHORS
expand all
collapse all
added
removed
loco_directory/media/img/back-to-teams.png
loco_directory/media/img/box/bottom-left.png
loco_directory/media/img/box/bottom-right.png
loco_directory/media/img/box/bottom.png
loco_directory/media/img/box/left.png
loco_directory/media/img/box/right.png
loco_directory/media/img/box/top-left.png
loco_directory/media/img/box/top-right.png
loco_directory/media/img/box/top.png
loco_directory/media/img/edit-team.png
loco_directory/media/img/nobranding.png
loco_directory/media/img/res/email.png
loco_directory/media/img/res/forum.png
loco_directory/media/img/res/irc.png
loco_directory/media/img/res/list.png
loco_directory/media/img/res/support.png
loco_directory/media/img/res/website.png
loco_directory/media/img/res/wiki.png
sources/back.svg
sources/dbox.svg
sources/edit.svg
sources/email.svg
sources/forum.svg
sources/irc.svg
sources/list.svg
sources/support.svg
sources/website.svg
sources/wiki.svg
