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

Commit: 8b205a972a91844b15282c312dac7c1002ada1bf
https://github.com/mikemintz/deme/commit/8b205a972a91844b15282c312dac7c1002ada1bf
Author: Jimmy Tobin <jtobin1@stanford.edu>;
Date: 2011-07-01 (Fri, 01 Jul 2011)

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

Log Message:
-----------
Added styling to event viewer


Commit: 7c7c19e62a9ddca7b9dffd0fa4aefef42fbcabb5
https://github.com/mikemintz/deme/commit/7c7c19e62a9ddca7b9dffd0fa4aefef42fbcabb5
Author: Jimmy Tobin <jtobin1@stanford.edu>;
Date: 2011-07-01 (Fri, 01 Jul 2011)

Changed paths:
M deme_django/TODO
M deme_django/cms/models.py
A deme_django/cms/templates/item/diff.html
M deme_django/cms/templates/notification/save_email.html
M deme_django/cms/templatetags/item_tags.py
M deme_django/cms/views.py
A deme_django/diff_match_patch.py
M deme_django/modules/event/templates/event/show.html

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

Conflicts:
deme_django/modules/event/templates/event/show.html


Compare: https://github.com/mikemintz/deme/compare/5f75cfa...7c7c19e