← Back to branch summary

~replaceafill/schooltool/flourish_search

~replaceafill/schooltool/flourish_search

Viewing all changes in revision 3312.

Committer: Douglas Cerna
Date: 2012-02-17 17:03:09 UTC
mfrom: (3308.1.1 schooltool_selenium)
Revision ID: douglascerna@yahoo.com-20120217170309-pskcgybdwknl16is

Merged with trunk

files modified:
src/schooltool/app/browser/app.py

src/schooltool/app/browser/templates/f_edit_relationships.pt

src/schooltool/contact/browser/relationship.py

Show diffs side-by-side

added added

removed removed

src/schooltool/app/browser/app.py

src/schooltool/app/browser/templates/f_edit_relationships.pt

src/schooltool/contact/browser/relationship.py

Older »