[sagenb] 116/157: Merge branch 'testjsmol' of https://github.com/kcrisman/sagenb into kcrisman-css

[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 72cc162d6fe161a18b1bcb7f22088685a55f6a19
Merge: 7235026 4b16304
Author: Karl-Dieter Crisman <kcrisman at gmail.com>
Date:   Mon Oct 20 14:30:08 2014 -0400

    Merge branch 'testjsmol' of https://github.com/kcrisman/sagenb into kcrisman-css

 sagenb/data/sage/css/main.css |  3 ++-
 sagenb/data/sage/js/master.js | 10 +++++-----
 sass/src/main.scss            |  8 +++++++-
 3 files changed, 14 insertions(+), 7 deletions(-)

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