← Back to branch summary

~ubuntuone-hackers/django-timelog/trunk

Viewing all changes in revision 15.

  • Committer: Gareth Rushgrove
  • Date: 2012-10-27 21:35:59 UTC
  • mfrom: (12.2.2)
  • Revision ID: git-v1:84c7015248a82faccb9d3fe4e6014645cc9ec103
Merge branch 'sql' of git://github.com/rassie/django-timelog into rassie-sql

Conflicts:
        src/timelog/lib.py

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: