[sagenb] 139/157: Merge pull request #257 from sagemath/3d_live_documentation

[felix salfelder]

This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch master
in repository sagenb.

commit e635b7bcf0f0d676eac84801586a79bf7b1680ff
Merge: f5eef91 1e669df
Author: kcrisman <kcrisman at gmail.com>
Date:   Thu Nov 6 11:25:53 2014 -0500

    Merge pull request #257 from sagemath/3d_live_documentation
    
    3d live documentation
    
    Whitelist jsmol as a command and fix directory typo.  Closes #256

 sagenb/flask_version/worksheet.py | 4 ++--
 sagenb/notebook/cell.py           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagenb.git