« back to all changes in this revision
Viewing changes to loggerhead.conf.example
- Committer: John Arbash Meinel
- Date: 2011-02-09 22:29:57 UTC
- mfrom: (157.1.22 devel)
- mto: This revision was merged to the branch mainline in revision 423.
- Revision ID: john@arbash-meinel.com-20110209222957-bwiyiqfbhv80zvs0
Merge the tip of launchpad's loggerhead branch back into the new trunk branch.
- files added:
- loggerhead/controllers/annotate_ui.py
- files renamed:
- loggerhead/controllers/annotate_ui.py => loggerhead/controllers/view_ui.py
- loggerhead/static/css/annotate.css => loggerhead/static/css/view.css
- loggerhead/templates/annotate.pt => loggerhead/templates/view.pt
- files modified:
- loggerhead/apps/branch.py
added
removed
loggerhead.conf.example
