Branch: refs/heads/master
Home: https://github.com/mikemintz/deme

Commit: 2b54c20cab185d85decef0f43d49eeef33f3e6a3
https://github.com/mikemintz/deme/commit/2b54c20cab185d85decef0f43d49eeef33f3e6a3
Author: Jimmy Tobin <jtobin1@stanford.edu>;
Date: 2011-10-18 (Tue, 18 Oct 2011)

Changed paths:
M deme_django/modules/event/templates/event/show.html

Log Message:
-----------
Fixed the placement of "to" and the mistaken body tag


Commit: ea43c04ba2b4f12ec8a3292be57df8b6b94a9821
https://github.com/mikemintz/deme/commit/ea43c04ba2b4f12ec8a3292be57df8b6b94a9821
Author: Jimmy Tobin <jtobin1@stanford.edu>;
Date: 2011-10-18 (Tue, 18 Oct 2011)

Changed paths:
A deme_django/SYMSYS_TODO
M deme_django/TODO
A deme_django/cms/migrations/0007_create_edit_lock.py
M deme_django/cms/models.py
M deme_django/cms/templates/item/edit.html
A deme_django/cms/templates/item/edit_locked.html
M deme_django/cms/templates/item/new.html
M deme_django/cms/views.py

Log Message:
-----------
Merge branch 'master' of github.com:mikemintz/deme


Compare: https://github.com/mikemintz/deme/compare/d8f0184...ea43c04