Branch: refs/heads/master
Home: https://github.com/mikemintz/deme
Commit: 78973ffd2fdf881d390473ed40c59378053f855d
https://github.com/mikemintz/deme/commit/78973ffd2fdf881d390473ed40c59378053f855d
Author: Michael Huang <mikhuang@gmail.com>;
Date: 2013-06-19 (Wed, 19 Jun 2013)

Changed paths:
M deme_django/cms/base_viewer.py
M deme_django/cms/templates/base_layout.html
A deme_django/cms/templates/demo/demo.html
M deme_django/script/create_initial_data.py

Log Message:
-----------
changing so that errors to template are caught as errors and result in the default site being displayed


Commit: 32bde02ce43b08ae9b2a166f85ffeb54f9879f8e
https://github.com/mikemintz/deme/commit/32bde02ce43b08ae9b2a166f85ffeb54f9879f8e
Author: Michael Huang <mikhuang@gmail.com>;
Date: 2013-06-28 (Fri, 28 Jun 2013)

Changed paths:
M deme_django/cms/base_viewer.py
M deme_django/cms/templates/base_layout.html

Log Message:
-----------
merging mike updates, catching more template exceptions, displaying the error


Compare: https://github.com/mikemintz/deme/compare/47bf218e04d6...32bde02ce43b