Viewing all changes in revision 303.
- Committer: Chris Johnston
- Date: 2012-03-07 14:11:34 UTC
- mfrom: (132.16.7 production)
- Revision ID: chrisjohnston@ubuntu.com-20120307141134-2csqmb9o4qkmqo1n
Fix conflict from production
- files modified:
- summit/schedule/templates/schedule/schedule.html
expand all
collapse all
added
removed
