~pidgeon690/mypidge-base/feature+publicity

  • Committer: Fergus Ross Ferrier
  • Date: 2008-11-24 14:12:39 UTC
  • mfrom: (231.1.8)
  • Revision ID: me@fergusrossferrier.co.uk-20081124141239-m2e7f3vhv61z69ic
Merge branch 'master' of /var/www/sites/fergustest/django

Conflicts:

        MyPidge/Start/views.py
Filename Latest Rev Last Changed Committer Comment Size
..
Admin Media 31 15 years ago Connell Gauld Admin Media added to repo so it can be customised Diff
Images 1 16 years ago Connell's dev site Initial commit Diff
Images Source 1 16 years ago Connell's dev site Initial commit Diff
Initial Data 30 15 years ago Connell Gauld Initial Data - CMG Diff
MyPidge 1 16 years ago Connell's dev site Initial commit Diff
Raven 17 15 years ago Connell's dev site Raven login - CMG Diff
Resources 1 16 years ago Connell's dev site Initial commit Diff
Templates 1 16 years ago Connell's dev site Initial commit Diff
.gitignore 91 15 years ago Fergus Ross Ferrier Merge branch 'master' of /home/fergus/Work/MyPidge 33 bytes Diff Download File
INSTRUCTIONS.txt 218 15 years ago Connell Gauld Merge /var/repos/MyPidge 1.1 KB Diff Download File
LICENSE 218 15 years ago Connell Gauld Merge /var/repos/MyPidge 33.7 KB Diff Download File
README 218 15 years ago Connell Gauld Merge /var/repos/MyPidge 1 KB Diff Download File