[mikemintz/deme] 08d4e4: Merge branch 'master' of github.com:mikemintz/deme

From contact method Email contact method 20
Item Git commits
Item version number 1
Branch: refs/heads/master
Home: https://github.com/mikemintz/deme

Commit: 08d4e4648fae32543f3b91041abbd206e90d58ff
https://github.com/mikemintz/deme/commit/08d4e4648fae32543f3b91041abbd206e90d58ff
Author: Jimmy Tobin <jtobin1@stanford.edu>;
Date: 2011-09-26 (Mon, 26 Sep 2011)

Changed paths:
R deme_django/TODO

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

Conflicts:
deme_django/TODO


Commit: ccc565371b6409eae525ae2d4385e171ecf5f505
https://github.com/mikemintz/deme/commit/ccc565371b6409eae525ae2d4385e171ecf5f505
Author: Jimmy Tobin <jtobin1@stanford.edu>;
Date: 2011-09-27 (Tue, 27 Sep 2011)

Changed paths:
M deme_django/cms/templates/default_layout.html

Log Message:
-----------
Added a Dictionary button


Compare: https://github.com/mikemintz/deme/compare/7660ac6...ccc5653

For Internet Explorer users: Click on the Tools menu, located at the top of your browser window. When the drop-down menu appears, select the option labeled Full Screen.

For Chrome users:Click on the Chrome "wrench" icon, located in the upper right hand corner of your browser window. When the drop-down menu appears, select the choice labeled Full Screen.

For Firefox user:Click on the View menu, located at the top of your browser window. When the drop-down menu appears, select the option labeled Full Screen.

For Safari users: Safari currently does not support the ability to go fullscreen.